run behave selftest in separated thread (connects allure-framework#88 via allure-framework#122)

sseliverstov · web-flow · commit ab0235b2d724 · 2017-07-26T17:06:14.000+03:00
diff --git a/allure-behave/features/steps/behave_steps.py b/allure-behave/features/steps/behave_steps.py
@@ -6,6 +6,7 @@
 from behave.configuration import Configuration
 from behave.formatter._registry import make_formatters
 from behave.formatter.base import StreamOpener
+import threading
 
 
 @given(u'feature definition')
@@ -18,15 +19,21 @@ def feature_definition(context, **kwargs):
 @when(u'I run behave with allure formatter')
 @when(u'I run behave with allure formatter with options "{args}"')
 def run_behave_with_allure(context, **kwargs):
-    cmd_args = '-v -f allure_behave.formatter:AllureFormatter -f pretty'
-    cmd = '{options} {cmd}'.format(cmd=cmd_args, options=kwargs.get('args', ''))
-    config = Configuration(command_args=cmd)
 
-    result_tmp_dir = mkdtemp(dir=os.environ.get('TEST_TMP', None))
-    stream_opener = StreamOpener(filename=result_tmp_dir)
+    def run(context, **kwargs):
+        cmd_args = '-v -f allure_behave.formatter:AllureFormatter -f pretty'
+        cmd = '{options} {cmd}'.format(cmd=cmd_args, options=kwargs.get('args', ''))
+        config = Configuration(command_args=cmd)
 
-    model_runner = ModelRunner(config, [context.feature_definition])
-    model_runner.formatters = make_formatters(config, [stream_opener])
-    model_runner.run()
+        result_tmp_dir = mkdtemp(dir=os.environ.get('TEST_TMP', None))
+        stream_opener = StreamOpener(filename=result_tmp_dir)
 
-    context.allure_report = AllureReport(result_tmp_dir)
+        model_runner = ModelRunner(config, [context.feature_definition])
+        model_runner.formatters = make_formatters(config, [stream_opener])
+        model_runner.run()
+
+        context.allure_report = AllureReport(result_tmp_dir)
+
+    behave_tread = threading.Thread(target=run, args=(context,), kwargs=kwargs)
+    behave_tread.start()
+    behave_tread.join()
diff --git a/allure-behave/src/listener.py b/allure-behave/src/listener.py
@@ -1,4 +1,4 @@
-from allure_commons import register
+from allure_commons import plugin_manager
 from allure_commons.logger import AllureFileLogger
 from allure_commons.reporter import AllureReporter
 from allure_commons.utils import uuid4
@@ -23,7 +23,7 @@ class AllureListener(object):
     def __init__(self, result_dir):
         self.logger = AllureReporter()
         file_logger = AllureFileLogger(result_dir)
-        register(file_logger)
+        plugin_manager.register(file_logger)
 
         self.current_group_uuid = None
         self.current_before_uuid = None
diff --git a/allure-pytest/src/plugin.py b/allure-pytest/src/plugin.py
@@ -91,15 +91,15 @@ def link_pattern(string):
 def pytest_configure(config):
     report_dir = config.option.allure_report_dir
     test_helper = AllureTestHelper(config)
-    allure_commons.register(test_helper)
+    allure_commons.plugin_manager.register(test_helper)
 
     if report_dir:
         test_listener = AllureListener(config)
         config.pluginmanager.register(test_listener)
-        allure_commons.register(test_listener)
+        allure_commons.plugin_manager.register(test_listener)
 
         file_logger = AllureFileLogger(report_dir)
-        allure_commons.register(file_logger)
+        allure_commons.plugin_manager.register(file_logger)
 
 
 def pytest_collection_modifyitems(items, config):
diff --git a/allure-python-commons/src/__init__.py b/allure-python-commons/src/__init__.py
@@ -1,10 +1,10 @@
 from allure_commons._hooks import hookimpl  # noqa: F401
-from allure_commons._core import register  # noqa: F401
+from allure_commons._core import plugin_manager  # noqa: F401
 from allure_commons._allure import fixture  # noqa: F401
 
 __all__ = [
-    'hookimpl'
-    'register'
+    'hookimpl',
+    'plugin_manager',
 
-    'fixture'
+    'fixture',
 ]
diff --git a/allure-python-commons/src/_core.py b/allure-python-commons/src/_core.py
@@ -1,13 +1,25 @@
 import threading
+from six import with_metaclass
 from pluggy import PluginManager
 from allure_commons import _hooks
 
 
-_storage = threading.local()
-_storage.plugin_manager = PluginManager('allure')
-_storage.plugin_manager.add_hookspecs(_hooks.AllureUserHooks)
-_storage.plugin_manager.add_hookspecs(_hooks.AllureDeveloperHooks)
+class MetaPluginManager(type):
+    _storage = threading.local()
 
+    @staticmethod
+    def get_plugin_manager():
+        if not hasattr(MetaPluginManager._storage, 'plugin_manager'):
+            MetaPluginManager._storage.plugin_manager = PluginManager('allure')
+            MetaPluginManager._storage.plugin_manager.add_hookspecs(_hooks.AllureUserHooks)
+            MetaPluginManager._storage.plugin_manager.add_hookspecs(_hooks.AllureDeveloperHooks)
 
-plugin_manager = _storage.plugin_manager
-register = plugin_manager.register
+        return MetaPluginManager._storage.plugin_manager
+
+    def __getattr__(cls, attr):
+        pm = MetaPluginManager.get_plugin_manager()
+        return getattr(pm, attr)
+
+
+class plugin_manager(with_metaclass(MetaPluginManager)):
+    pass
