Code quality

- refactoring
- autodetect Qt tests
- remove obsolete code

Author: PeterSurda

src/bitmessageqt/__init__.py

@@ -33,7 +33,6 @@
 from bmconfigparser import config
 import namecoin
 from messageview import MessageView
-from migrationwizard import Ui_MigrationWizard
 from foldertree import (
     AccountMixin, Ui_FolderWidget, Ui_AddressWidget, Ui_SubscriptionWidget,
     MessageList_AddressWidget, MessageList_SubjectWidget,
@@ -4296,15 +4295,17 @@ def __init__(self, *argv):
             # for whenever a second instance tries to run focus the application.
             self.server = QLocalServer()
             self.server.listen(self.UUID)
-            self.server.newConnection.connect(self.on_new_connection)
+            self.server.newConnection.connect(
+                BitmessageQtApplication.on_new_connection)
 
         self.setStyleSheet("QStatusBar::item { border: 0px solid black }")
 
     def __del__(self):
         if self.server:
             self.server.close()
 
-    def on_new_connection(self):  # pylint: disable=no-self-use
+    @staticmethod
+    def on_new_connection():
         if myapp:
             myapp.appIndicatorShow()
 

src/bitmessageqt/migrationwizard.py

@@ -57,9 +57,9 @@ def stopUpdate(self):
         """Stop counter update timer"""
         self.timer.stop()
 
-    def formatBytes(self, num):
+    @staticmethod
+    def formatBytes(num):
         """Format bytes nicely (SI prefixes)"""
-        # pylint: disable=no-self-use
         for x in [
                 _translate(
                     "networkstatus",
@@ -76,9 +76,9 @@ def formatBytes(self, num):
             num /= 1000.0
         return "%3.0f %s" % (num, 'TB')
 
-    def formatByteRate(self, num):
+    @staticmethod
+    def formatByteRate(num):
         """Format transfer speed in kB/s"""
-        # pylint: disable=no-self-use
         num /= 1000
         return "%4.0f kB" % num
 
@@ -135,13 +135,13 @@ def updateNumberOfBytes(self):
             _translate(
                 "networkstatus",
                 "Down: %1/s  Total: %2").arg(
-                    self.formatByteRate(network.stats.downloadSpeed()),
-                    self.formatBytes(network.stats.receivedBytes())))
+                    NetworkStatus.formatByteRate(network.stats.downloadSpeed()),
+                    NetworkStatus.formatBytes(network.stats.receivedBytes())))
         self.labelBytesSentCount.setText(
             _translate(
                 "networkstatus", "Up: %1/s  Total: %2").arg(
-                    self.formatByteRate(network.stats.uploadSpeed()),
-                    self.formatBytes(network.stats.sentBytes())))
+                    NetworkStatus.formatByteRate(network.stats.uploadSpeed()),
+                    NetworkStatus.formatBytes(network.stats.sentBytes())))
 
     def updateNetworkStatusTab(self, outbound, add, destination):
         """Add or remove an entry to the list of connected peers"""

src/bitmessageqt/networkstatus.py

@@ -1,18 +1 @@
 """bitmessageqt tests"""
-
-from .addressbook import TestAddressbook
-from .main import TestMain, TestUISignaler
-from .settings import TestSettings
-from .support import TestSupport
-from .test_import import TestImports
-from .test_startup import TestStartup
-from .test_widgets import (
-    TestAddressValidator, TestLanguageBox, TestMessageView,
-    TestSafeHTMLParser
-)
-
-__all__ = [
-    "TestAddressbook", "TestAddressValidator", "TestLanguageBox",
-    "TestImports", "TestMain", "TestMessageView", "TestSafeHTMLParser",
-    "TestSettings", "TestStartup", "TestSupport", "TestUISignaler"
-]

src/bitmessageqt/tests/__init__.py

@@ -4,7 +4,7 @@
 import helper_addressbook
 from bitmessageqt.support import createAddressIfNeeded
 
-from main import TestBase  # pylint: disable=no-name-in-module
+from .test_main import TestBase
 
 
 class TestAddressbook(TestBase):

src/bitmessageqt/tests/addressbook.py …c/bitmessageqt/tests/test_addressbook.pysrc/bitmessageqt/tests/addressbook.py renamed to src/bitmessageqt/tests/test_addressbook.py src/bitmessageqt/tests/addressbook.py renamed to src/bitmessageqt/tests/test_addressbook.py

@@ -8,7 +8,7 @@
 from bmconfigparser import config
 from bitmessageqt import settings
 
-from .main import TestBase
+from .test_main import TestBase
 
 
 class TestSettings(TestBase):

src/bitmessageqt/tests/main.py src/bitmessageqt/tests/test_main.pysrc/bitmessageqt/tests/main.py renamed to src/bitmessageqt/tests/test_main.py

@@ -5,7 +5,7 @@
 
 import sys
 
-from main import TestBase  # pylint: disable=no-name-in-module
+from .test_main import TestBase
 from shared import isAddressInMyAddressBook
 
 

src/bitmessageqt/tests/settings.py src/bitmessageqt/tests/test_settings.pysrc/bitmessageqt/tests/settings.py renamed to src/bitmessageqt/tests/test_settings.py

@@ -422,7 +422,11 @@ def run():
     except ImportError:
         Xvfb = None
     else:
-        qt_tests = loader.loadTestsFromModule(bitmessageqt.tests)
+        qt_test_dir = os.path.dirname(bitmessageqt.tests.__file__)
+        qt_tests = loader.discover(
+            qt_test_dir,
+            top_level_dir=os.path.dirname(
+                os.path.dirname(qt_test_dir)))
         suite.addTests(qt_tests)
 
     def keep_exc(ex_cls, exc, tb):  # pylint: disable=unused-argument