From d222018bb65b198ac4e12e43b9634c67d365f5a9 Mon Sep 17 00:00:00 2001 From: HelloZeroNet Date: Wed, 23 Mar 2016 13:30:18 +0100 Subject: [PATCH] Parse config plugins on test --- src/Test/conftest.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Test/conftest.py b/src/Test/conftest.py index ad52adb1..229be847 100644 --- a/src/Test/conftest.py +++ b/src/Test/conftest.py @@ -24,14 +24,18 @@ sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + "/..")) # Import from Config import config config.argv = ["none"] # Dont pass any argv to config parser -config.parse() -config.data_dir = "src/Test/testdata" # Use test data for unittests -config.debug_socket = True # Use test data for unittests -config.tor = "disabled" # Don't start Tor client +config.parse() # Plugins need to access the configuration logging.basicConfig(level=logging.DEBUG, stream=sys.stdout) from Plugin import PluginManager PluginManager.plugin_manager.loadPlugins() +config.loadPlugins() +config.parse() # Parse again to add plugin configuration options + +config.data_dir = "src/Test/testdata" # Use test data for unittests +config.debug_socket = True # Use test data for unittests +config.tor = "disabled" # Don't start Tor client + import gevent from gevent import monkey