fix xdist keyerror (fixes $368 via #372)

Author: sseliverstov

allure-pytest/src/listener.py

@@ -157,7 +157,7 @@ def pytest_fixture_post_finalizer(self, fixturedef):
 
     @pytest.hookimpl(hookwrapper=True)
     def pytest_runtest_makereport(self, item, call):
-        uuid = self._cache.push(item.nodeid)
+        uuid = self._cache.get(item.nodeid)
 
         report = (yield).get_result()
 
@@ -203,7 +203,8 @@ def pytest_runtest_makereport(self, item, call):
     def pytest_runtest_logfinish(self, nodeid, location):
         yield
         uuid = self._cache.pop(nodeid)
-        self.allure_logger.close_test(uuid)
+        if uuid:
+            self.allure_logger.close_test(uuid)
 
     @allure_commons.hookimpl
     def attach_data(self, body, name, attachment_type, extension):
@@ -258,7 +259,7 @@ def push(self, _id):
         return self._items.setdefault(str(_id), uuid4())
 
     def pop(self, _id):
-        return self._items.pop(str(_id))
+        return self._items.pop(str(_id), None)
 
 
 def _test_fixtures(item):

allure-pytest/test/integration/pytest_xdistr/__init__.py renamed to allure-pytest/test/integration/pytest_xdist/__init__.py

@@ -7,7 +7,7 @@
 @allure.issue("292")
 @allure.feature("Integration")
 @pytest.mark.real_logger
-def test_xdistr_and_select_test_by_bdd_label(allured_testdir):
+def test_xdist_and_select_test_by_bdd_label(allured_testdir):
     """
     >>> import pytest
     >>> import allure
@@ -22,7 +22,7 @@ def test_xdistr_and_select_test_by_bdd_label(allured_testdir):
     """
 
     allured_testdir.parse_docstring_source()
-    allured_testdir.run_with_allure("-v", "--allure-features=boo", "-n2")
+    allured_testdir.run_with_allure("-v", "--allure-features=boo", "-n1")
 
     assert_that(allured_testdir.allure_report,
                 has_only_testcases(

allure-pytest/test/integration/pytest_xdistr/pytest_xdistr_select_test.py renamed to allure-pytest/test/integration/pytest_xdist/pytest_xdist_select_test.py

@@ -1,7 +1,7 @@
 [tox]
 envlist =
     py{27,36,37}
-;    xdist
+    xdist
     integration
     static_check
 
@@ -51,19 +51,21 @@ commands =
 [testenv:xdist]
 passenv = HOME
 
-basepython = python3.5
-
-whitelist_externals = rm
+basepython = python3.7
 
 deps =
     pyhamcrest
     pytest-xdist
+    mock
     {distshare}/allure-python-commons-2*.zip
     {distshare}/allure-python-commons-test-2*.zip
 
 commands =
-    rm -f {envtmpdir}/*.json
-    py.test -n 4 --doctest-module --alluredir={envtmpdir} {posargs: ./test/}
+    py.test --basetemp={envtmpdir}/tmp \
+            --alluredir={envtmpdir}/allure-results \
+            -W ignore::pytest.PytestExperimentalApiWarning \
+            -p pytester \
+            -n 3 {posargs: ./test/acceptance}
 
 
 # Run tests without result checking. It is useful for: