Rev4070, Fix Multiuser plugin import order, Run coverage before optional plugins

.travis.yml

@@ -33,9 +33,9 @@ script:
  - python -m pytest -x plugins/Bigfile/Test
  - python -m pytest -x plugins/AnnounceLocal/Test
  - python -m pytest -x plugins/OptionalManager/Test
+ - python -m pytest src/Test --cov=src --cov-config src/Test/coverage.ini
  - mv plugins/disabled-Multiuser plugins/Multiuser && python -m pytest -x plugins/Multiuser/Test
  - mv plugins/disabled-Bootstrapper plugins/Bootstrapper && python -m pytest -x plugins/Bootstrapper/Test
- - python -m pytest src/Test --cov=src --cov-config src/Test/coverage.ini
 before_install:
   - pip install -U pytest mock pytest-cov selenium
   - pip install codecov

plugins/disabled-Multiuser/MultiuserPlugin.py

@@ -5,9 +5,14 @@ import json
 from Config import config
 from Plugin import PluginManager
 from Crypt import CryptBitcoin
-from User import UserManager
 from . import UserPlugin
 
+# We can only import plugin host clases after the plugins are loaded
+@PluginManager.afterLoad
+def importPluginnedClasses():
+    global UserManager
+    from User import UserManager
+
 try:
     local_master_addresses = set(json.load(open("%s/users.json" % config.data_dir)).keys())  # Users in users.json
 except Exception as err:

src/Config.py

@@ -13,7 +13,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.7.0"
-        self.rev = 4069
+        self.rev = 4070
         self.argv = argv
         self.action = None
         self.pending_changes = {}