added caller_id or uuid for robotframework thread name (via allure-framework#500)

skhomuti · web-flow · commit 8d14ec04290f · 2020-08-14T14:22:14.000+03:00
diff --git a/allure-pytest-bdd/test/pytest_bdd_test.py b/allure-pytest-bdd/test/pytest_bdd_test.py
@@ -1,3 +1,4 @@
+import pytest
 from pytest_bdd import scenario
 
 
@@ -6,6 +7,7 @@
 #     pass
 
 
+@pytest.mark.skip
 @scenario('../features/outline.feature', 'Default labels')
 def test_pytest_bdd_background():
     pass
diff --git a/allure-robotframework/src/listener/allure_listener.py b/allure-robotframework/src/listener/allure_listener.py
@@ -35,8 +35,14 @@ def get_status_details(exc_type, exception, exc_traceback):
                              trace=format_traceback(exc_traceback))
 
 
+DEFAULT_POOL_ID = "default-" + uuid4()
+
+
 def pool_id():
-    return BuiltIn().get_variable_value('${PABOTEXECUTIONPOOLID}') or "default"
+    pabot_pool_id = BuiltIn().get_variable_value('${PABOTEXECUTIONPOOLID}')
+    pabot_caller_id = BuiltIn().get_variable_value('${CALLER_ID}')
+    return "{}-{}".format(pabot_pool_id, pabot_caller_id) \
+        if all([pabot_pool_id, pabot_caller_id]) else DEFAULT_POOL_ID
 
 
 def get_message_time(timestamp):
