From d03ef507852a0f975e5024793f1105aa9b2fa592 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Sun, 22 Dec 2019 16:53:18 +0100
Subject: [PATCH] Fix various warning while running app and tests
---
.pylintrc | 3 ++-
setup.cfg | 2 ++
src/briar-gtk.in | 2 --
src/briar/gtk/application.py | 3 +++
tests/briar/gtk/test_application.py | 7 +++++++
tests/conftest.py | 2 +-
6 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 setup.cfg
diff --git a/.pylintrc b/.pylintrc
index 68c0cee..5fde3fa 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -7,4 +7,5 @@
disable=attribute-defined-outside-init,
duplicate-code,
fixme,
- missing-docstring
+ missing-docstring,
+ wrong-import-position
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..e645cdd
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[pycodestyle]
+ignore = E126,E402
diff --git a/src/briar-gtk.in b/src/briar-gtk.in
index a0ab663..aac441d 100755
--- a/src/briar-gtk.in
+++ b/src/briar-gtk.in
@@ -13,8 +13,6 @@ import os
import signal
import sys
-import gi
-gi.require_version('Gtk', '3.0')
from gi.repository import Gio
PACKAGE_DATA_DIR = '@PACKAGE_DATA_DIR@'
diff --git a/src/briar/gtk/application.py b/src/briar/gtk/application.py
index c834d0f..eddfebb 100644
--- a/src/briar/gtk/application.py
+++ b/src/briar/gtk/application.py
@@ -6,6 +6,9 @@
# Initial version based on GNOME Lollypop
# https://gitlab.gnome.org/World/lollypop/blob/1.0.2/lollypop/application.py
+import gi
+gi.require_version('Gdk', '3.0')
+gi.require_version('Gtk', '3.0')
from gi.repository import Gdk, Gio, GLib, Gtk
from briar_wrapper.api import Api
diff --git a/tests/briar/gtk/test_application.py b/tests/briar/gtk/test_application.py
index a86f3f2..1607637 100644
--- a/tests/briar/gtk/test_application.py
+++ b/tests/briar/gtk/test_application.py
@@ -4,6 +4,8 @@
from unittest.mock import Mock
+import pytest
+
from briar_wrapper.api import Api
from briar.gtk.application import Application
from briar.gtk.define import APPLICATION_NAME, APPLICATION_STYLING_PATH
@@ -137,3 +139,8 @@ def test_setup_window_has_none_attribute(mocker):
window_show_mock.assert_called_once()
window_present_mock.assert_called_once()
+
+
+@pytest.fixture(autouse=True)
+def glib_set_application_name(mocker):
+ mocker.patch("gi.repository.GLib.set_application_name")
diff --git a/tests/conftest.py b/tests/conftest.py
index 7d483ab..3fad9db 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -27,5 +27,5 @@ def auth_token():
def request_headers(auth_token):
request_headers = {
"Authorization": 'Bearer %s' % auth_token
- }
+ }
return request_headers
--
GitLab