Qaaaaaaaa patch 1 (#1)

* Update setup.py

* Update utils.py

* Update listener.py

Author: QAAAAAAAA

allure-pytest/setup.py

@@ -41,12 +41,12 @@
 ]
 
 
-def prepare_version():
-    from setuptools_scm import get_version
-    configuration = {"root": "..",  "relative_to": __file__}
-    version = get_version(**configuration)
-    install_requires.append(f"allure-python-commons=={version}")
-    return configuration
+# def prepare_version():
+#     from setuptools_scm import get_version
+#     configuration = {"root": "..",  "relative_to": __file__}
+#     version = get_version(**configuration)
+#     install_requires.append(f"allure-python-commons=={version}")
+#     return configuration
 
 
 def get_readme(fname):

allure-pytest/src/listener.py

@@ -223,10 +223,14 @@ def pytest_runtest_makereport(self, item, call):
             if test_result.status == Status.PASSED:
                 test_result.status = status
                 test_result.statusDetails = status_details
+                
+            if status in (Status.FAILED, Status.BROKEN):
+                test_result.status = Status.FAILED
+                test_result.statusDetails = status_details
 
         if report.when == 'teardown':
-            if status in (Status.FAILED, Status.BROKEN) and test_result.status == Status.PASSED:
-                test_result.status = status
+            if status in (Status.FAILED, Status.BROKEN):
+                test_result.status = Status.FAILED
                 test_result.statusDetails = status_details
 
             if self.config.option.attach_capture:

allure-pytest/src/utils.py

@@ -155,7 +155,11 @@ def get_outcome_status_details(outcome):
 
 def get_status(exception):
     if exception:
-        return Status.FAILED
+        if isinstance(exception, AssertionError) or isinstance(exception, pytest.fail.Exception):
+            return Status.FAILED
+        elif isinstance(exception, pytest.skip.Exception):
+            return Status.SKIPPED
+        return Status.BROKEN
     else:
         return Status.PASSED