Merge branch 'master' into allure_step_in_thread

Author: nigredon1991

allure-behave/features/description.feature

@@ -13,3 +13,24 @@ Feature: Description
         """
      When I run behave with allure formatter
      Then allure report has a scenario with name "Scenario with description"
+
+  Scenario: Dynamic description
+    Given feature definition
+        """
+        Feature: Step status
+
+          Scenario: Scenario with passed step
+              Given simple passed step
+        """
+      And hooks implementation
+        """
+        import allure
+        import allure_commons
+
+        @allure_commons.fixture
+        def before_scenario(context, scenario):
+            allure.dynamic.description("Test description")
+        """
+     When I run behave with allure formatter
+     Then allure report has a scenario with name "Scenario with passed step"
+      And scenario has description "Test description"

allure-behave/features/link.feature

@@ -1,6 +1,6 @@
 Feature: Link
 
-    Scenario: Scenario issue link
+  Scenario: Scenario issue link
     Given feature definition
         """
         Feature: Step status
@@ -26,7 +26,6 @@ Feature: Link
      Then allure report has a scenario with name "Scenario with passed step"
       And scenario has "http://qameta.io" link
 
-
   Scenario: Feature and scenario user link
     Given feature definition
         """
@@ -41,3 +40,26 @@ Feature: Link
      Then allure report has a scenario with name "Scenario with passed step"
       And scenario has "http://qameta.io" link
       And scenario has "http://example.com" link with type "issue"
+
+  Scenario: Dynamic link
+    Given feature definition
+        """
+        Feature: Step status
+
+          Scenario: Scenario with passed step
+              Given simple passed step
+        """
+      And hooks implementation
+        """
+        import allure
+        import allure_commons
+
+        @allure_commons.fixture
+        def before_scenario(context, scenario):
+            allure.dynamic.link("http://qameta.io")
+            allure.dynamic.issue("http://example.com")
+        """
+     When I run behave with allure formatter
+     Then allure report has a scenario with name "Scenario with passed step"
+      And scenario has "http://qameta.io" link
+      And scenario has "http://example.com" link with type "issue"

allure-behave/features/steps/report_steps.py

@@ -1,5 +1,5 @@
 from functools import partial
-from hamcrest import assert_that
+from hamcrest import assert_that, contains_string
 from hamcrest import not_
 from allure_commons_test.report import has_test_case
 from allure_commons_test.result import with_status
@@ -9,6 +9,7 @@
 from allure_commons_test.result import has_status_details
 from allure_commons_test.result import with_message_contains
 from allure_commons_test.result import has_link
+from allure_commons_test.result import has_description
 from allure_commons_test.container import has_container
 from allure_commons_test.container import has_before, has_after
 from allure_commons_test.label import has_severity
@@ -149,3 +150,10 @@ def step_attachment(context, item):
     context_matcher = getattr(context, item)
     matcher = partial(context_matcher, has_attachment)
     assert_that(context.allure_report, matcher())
+
+
+@then(u'scenario has description "{description}"')
+def step_description(context, description):
+    context_matcher = context.scenario
+    matcher = partial(context_matcher, has_description, contains_string(description))
+    assert_that(context.allure_report, matcher())

allure-behave/features/test_plan.feature

@@ -36,10 +36,54 @@ Feature: Test plan
       """
     When I run behave with allure formatter
     Then allure report has a scenario with name "Scenario with passed step"
+    Then allure report has a scenario with name "Ignored scenario"
+      And this scenario has "skipped" status
+    Then allure report has a scenario with name "Another scenario with passed step"
+    Then allure report has a scenario with name "Another ignored scenario"
+      And this scenario has "skipped" status
+
+  Scenario: Drop unselected test from report
+    Given feature definition
+      """
+      Feature: Test plan example
+
+      Scenario: Scenario with passed step
+        Given passed step
+
+      Scenario: Ignored scenario
+        Given passed step
+      """
+    Given feature definition
+      """
+      Feature: Another Test plan example
+
+      Scenario: Another scenario with passed step
+        Given passed step
+
+      Scenario: Another ignored scenario
+        Given passed step
+      """
+    Given test plan
+      """
+      {
+        "version":"1.0",
+        "tests": [
+          {
+            "selector": "Test plan example: Scenario with passed step"
+          },
+          {
+            "selector": "Another Test plan example: Another scenario with passed step"
+          }
+        ]
+      }
+      """
+    When I run behave with allure formatter with options "-D AllureFormatter.hide_excluded=True"
+    Then allure report has a scenario with name "Scenario with passed step"
     Then allure report has not a scenario with name "Ignored scenario"
     Then allure report has a scenario with name "Another scenario with passed step"
     Then allure report has not a scenario with name "Another ignored scenario"
 
+
   Scenario: Select scenarios by allureid
     Given feature definition
       """
@@ -79,7 +123,7 @@ Feature: Test plan
         ]
       }
       """
-    When I run behave with allure formatter
+    When I run behave with allure formatter with options "-D AllureFormatter.hide_excluded=True"
     Then allure report has a scenario with name "Scenario with passed step"
     Then allure report has not a scenario with name "Ignored scenario"
     Then allure report has a scenario with name "Another scenario with passed step"

allure-behave/src/listener.py

@@ -6,12 +6,12 @@
 from allure_commons.utils import uuid4
 from allure_commons.utils import now
 from allure_commons.utils import platform_label
-from allure_commons.types import LabelType, AttachmentType
+from allure_commons.types import LabelType, AttachmentType, LinkType
 from allure_commons.model2 import TestResult
 from allure_commons.model2 import TestStepResult
 from allure_commons.model2 import TestBeforeResult, TestAfterResult
 from allure_commons.model2 import TestResultContainer
-from allure_commons.model2 import Parameter, Label
+from allure_commons.model2 import Parameter, Label, Link
 from allure_behave.utils import scenario_parameters
 from allure_behave.utils import scenario_name
 from allure_behave.utils import scenario_history_id
@@ -33,6 +33,9 @@
 class AllureListener(object):
     def __init__(self, behave_config):
         self.behave_config = behave_config
+        self.issue_pattern = behave_config.userdata.get('AllureFormatter.issue_pattern', None)
+        self.link_pattern = behave_config.userdata.get('AllureFormatter.link_pattern', None)
+        self.hide_excluded = behave_config.userdata.get('AllureFormatter.hide_excluded', False)
         self.logger = AllureReporter()
         self.current_step_uuid = None
         self.current_scenario_uuid = None
@@ -100,9 +103,10 @@ def start_scenario(self, scenario):
         test_case.description = '\n'.join(scenario.description)
         test_case.parameters = scenario_parameters(scenario)
 
-        issue_pattern = self.behave_config.userdata.get('AllureFormatter.issue_pattern', None)
-        link_pattern = self.behave_config.userdata.get('AllureFormatter.link_pattern', None)
-        test_case.links.extend(scenario_links(scenario, issue_pattern=issue_pattern, link_pattern=link_pattern))
+        test_case.links.extend(scenario_links(
+            scenario,
+            issue_pattern=self.issue_pattern,
+            link_pattern=self.link_pattern))
         test_case.labels.extend(scenario_labels(scenario))
         test_case.labels.append(Label(name=LabelType.FEATURE, value=scenario.feature.name))
         test_case.labels.append(Label(name=LabelType.FRAMEWORK, value='behave'))
@@ -115,8 +119,12 @@ def stop_test(self, parent_uuid, uuid, name, context, exc_type, exc_val, exc_tb)
         self.stop_scenario(context['scenario'])
 
     def stop_scenario(self, scenario):
-        if scenario.status == 'skipped' \
-                and not self.behave_config.show_skipped or scenario.skip_reason == TEST_PLAN_SKIP_REASON:
+        should_run = (scenario.should_run_with_tags(self.behave_config.tags) and
+                      scenario.should_run_with_name_select(self.behave_config))
+        should_drop_skipped_by_option = scenario.status == 'skipped' and not self.behave_config.show_skipped
+        should_drop_excluded = self.hide_excluded and (scenario.skip_reason == TEST_PLAN_SKIP_REASON or not should_run)
+
+        if should_drop_skipped_by_option or should_drop_excluded:
             self.logger.drop_test(self.current_scenario_uuid)
         else:
             status = scenario_status(scenario)
@@ -191,6 +199,36 @@ def attach_data(self, body, name, attachment_type, extension):
     def attach_file(self, source, name, attachment_type, extension):
         self.logger.attach_file(uuid4(), source, name=name, attachment_type=attachment_type, extension=extension)
 
+    @allure_commons.hookimpl
+    def add_description(self, test_description):
+        test_result = self.logger.get_test(None)
+        if test_result:
+            test_result.description = test_description
+
+    @allure_commons.hookimpl
+    def add_description_html(self, test_description_html):
+        test_result = self.logger.get_test(None)
+        if test_result:
+            test_result.descriptionHtml = test_description_html
+
+    @allure_commons.hookimpl
+    def add_link(self, url, link_type, name):
+        test_result = self.logger.get_test(None)
+        if test_result:
+            pattern = u'{}'
+            if link_type == LinkType.ISSUE and self.issue_pattern:
+                pattern = self.issue_pattern
+            elif link_type == LinkType.LINK and self.link_pattern:
+                pattern = self.link_pattern
+
+            link_url = pattern.format(url)
+            new_link = Link(link_type, link_url, link_url if name is None else name)
+            for link in test_result.links:
+                if link.url == new_link.url:
+                    return
+
+            test_result.links.append(new_link)
+
 
 class Context(list):
     def __init__(self, _list=list()):

allure-pytest/src/listener.py

@@ -100,6 +100,8 @@ def pytest_runtest_call(self, item):
         uuid = self._cache.get(item.nodeid)
         test_result = self.allure_logger.get_test(uuid)
         if test_result:
+            self.allure_logger.drop_test(uuid)
+            self.allure_logger.schedule_test(uuid, test_result)
             test_result.start = now()
         yield
         if test_result:
@@ -266,23 +268,23 @@ def __init__(self):
         self._items = dict()
 
     def get(self, _id):
-        return self._items.get(str(_id))
+        return self._items.get(id(_id))
 
     def push(self, _id):
-        return self._items.setdefault(str(_id), uuid4())
+        return self._items.setdefault(id(_id), uuid4())
 
     def pop(self, _id):
-        return self._items.pop(str(_id), None)
+        return self._items.pop(id(_id), None)
 
 
 def _test_fixtures(item):
     fixturemanager = item.session._fixturemanager
     fixturedefs = []
 
-    if hasattr(item._request, "fixturenames"):
+    if hasattr(item, "_request") and hasattr(item._request, "fixturenames"):
         for name in item._request.fixturenames:
-            fixturedef = fixturemanager.getfixturedefs(name, item.nodeid)
-            if fixturedef:
-                fixturedefs.append(fixturedef[-1])
+            fixturedefs_pytest = fixturemanager.getfixturedefs(name, item.nodeid)
+            if fixturedefs_pytest:
+                fixturedefs.extend(fixturedefs_pytest)
 
     return fixturedefs

allure-pytest/src/plugin.py

@@ -83,6 +83,15 @@ def a_label_type(string):
                                          help="""Comma-separated list of story names.
                                          Run tests that have at least one of the specified story labels.""")
 
+    parser.getgroup("general").addoption('--allure-ids',
+                                         action="store",
+                                         dest="allure_ids",
+                                         metavar="IDS_SET",
+                                         default={},
+                                         type=label_type(LabelType.ID),
+                                         help="""Comma-separated list of IDs.
+                                         Run tests that have at least one of the specified id labels.""")
+
     def link_pattern(string):
         pattern = string.split(':', 1)
         if not pattern[0]:
@@ -145,6 +154,7 @@ def select_by_labels(items, config):
     arg_labels = set().union(config.option.allure_epics,
                              config.option.allure_features,
                              config.option.allure_stories,
+                             config.option.allure_ids,
                              config.option.allure_severities)
     return filter(lambda item: arg_labels & set(allure_labels(item)) if arg_labels else True, items)
 

allure-pytest/test/acceptance/fixture/fixture_test.py

@@ -2,8 +2,8 @@
 import allure
 from hamcrest import assert_that, not_
 from allure_commons_test.report import has_test_case
-from allure_commons_test.container import has_container
-from allure_commons_test.container import has_before
+from allure_commons_test.container import has_container, has_before, has_after
+from allure_commons_test.result import has_step
 from itertools import combinations_with_replacement
 
 fixture_scopes = ["session", "module", "class", "function"]
@@ -217,3 +217,58 @@ def test_with_titled_conftest_fixtures(first_fixture, second_fixture):
                                             )
                               )
                 )
+
+
+def test_fixture_override(allured_testdir):
+    allured_testdir.testdir.makeconftest("""
+        import pytest
+        import allure
+
+        @pytest.fixture
+        def my_fixture():
+            with allure.step('Step in before in original fixture'):
+                pass
+            yield
+            with allure.step('Step in after in original fixture'):
+                pass
+
+    """)
+
+    allured_testdir.testdir.makepyfile("""
+        import pytest
+        import allure
+
+        @pytest.fixture
+        def my_fixture(my_fixture):
+            with allure.step('Step in before in redefined fixture'):
+                pass
+            yield
+            with allure.step('Step in after in redefined fixture'):
+                pass
+
+        def test_with_redefined_fixture(my_fixture):
+            pass
+    """)
+
+    allured_testdir.run_with_allure()
+
+    assert_that(allured_testdir.allure_report,
+                has_test_case("test_with_redefined_fixture",
+                              has_container(allured_testdir.allure_report,
+                                            has_before("my_fixture",
+                                                       has_step("Step in before in original fixture")
+                                                       ),
+                                            has_after("my_fixture::0",
+                                                      has_step("Step in after in original fixture")
+                                                      )
+                                            ),
+                              has_container(allured_testdir.allure_report,
+                                            has_before("my_fixture",
+                                                       has_step("Step in before in redefined fixture")
+                                                       ),
+                                            has_after("my_fixture::0",
+                                                      has_step("Step in after in redefined fixture")
+                                                      )
+                                            ),
+                              )
+                )