removed xfail

2023-05-19 02:30:49 +03:00
2 changed files with 27 additions and 27 deletions
@@ -263,28 +263,28 @@ def pytest_runtest_makereport(item, call):
        is_group = "xdist_group" in item.keywords._markers or "xdist_group" in item.parent.keywords._markers
        error_intro, error = 'Test setup failed:', ''
        final_error = '%s %s' % (error_intro, error)
-        if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and (str([mark.args[0] for mark in item.iter_markers(name='testrail_id')][0]) in str(case_ids_set))):
-            if '[NOTRUN]' in report.wasxfail:
-                test_suite_data.set_current_test(item.name, testrail_case_id=get_testrail_case_id(item))
-                test_suite_data.current_test.create_new_testrun()
-                if is_group:
-                    test_suite_data.current_test.group_name = item.instance.__class__.__name__
-                error_intro, error = 'Test is not run, e2e blocker ', report.wasxfail
-                final_error = "%s [[%s]]" % (error_intro, error)
-            else:
-                if is_group:
-                    test_suite_data.current_test.group_name = item.instance.__class__.__name__
-                error = catch_error()
-                final_error = '%s %s [[%s]]' % (error_intro, error, report.wasxfail)
-        else:
-            if is_group and report.failed:
-                test_suite_data.current_test.group_name = item.instance.__class__.__name__
-                error = catch_error()
-                final_error = '%s %s' % (error_intro, error)
-                if is_sauce_env:
-                    update_sauce_jobs(test_suite_data.current_test.group_name,
-                                      test_suite_data.current_test.testruns[-1].jobs,
-                                      report.passed)
+        # if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and (str([mark.args[0] for mark in item.iter_markers(name='testrail_id')][0]) in str(case_ids_set))):
+        #     if '[NOTRUN]' in report.wasxfail:
+        #         test_suite_data.set_current_test(item.name, testrail_case_id=get_testrail_case_id(item))
+        #         test_suite_data.current_test.create_new_testrun()
+        #         if is_group:
+        #             test_suite_data.current_test.group_name = item.instance.__class__.__name__
+        #         error_intro, error = 'Test is not run, e2e blocker ', report.wasxfail
+        #         final_error = "%s [[%s]]" % (error_intro, error)
+        #     else:
+        #         if is_group:
+        #             test_suite_data.current_test.group_name = item.instance.__class__.__name__
+        #         error = catch_error()
+        #         final_error = '%s %s [[%s]]' % (error_intro, error, report.wasxfail)
+        # else:
+        if is_group and report.failed:
+            test_suite_data.current_test.group_name = item.instance.__class__.__name__
+            error = catch_error()
+            final_error = '%s %s' % (error_intro, error)
+            if is_sauce_env:
+                update_sauce_jobs(test_suite_data.current_test.group_name,
+                                  test_suite_data.current_test.testruns[-1].jobs,
+                                  report.passed)
        if error:
            test_suite_data.current_test.testruns[-1].error = final_error
            from support.github_report import GithubHtmlReport
@@ -295,10 +295,10 @@ def pytest_runtest_makereport(item, call):
        error = catch_error()
        if report.failed:
            current_test.testruns[-1].error = error
-        if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and (str([mark.args[0] for mark in item.iter_markers(name='testrail_id')][0]) in str(case_ids_set))):
-            current_test.testruns[-1].xfail = report.wasxfail
-            if error:
-                current_test.testruns[-1].error = '%s [[%s]]' % (error, report.wasxfail)
+        # if (hasattr(report, 'wasxfail') and not case_ids_set) or (hasattr(report, 'wasxfail') and (str([mark.args[0] for mark in item.iter_markers(name='testrail_id')][0]) in str(case_ids_set))):
+        #     current_test.testruns[-1].xfail = report.wasxfail
+        #     if error:
+        #         current_test.testruns[-1].error = '%s [[%s]]' % (error, report.wasxfail)
        if is_sauce_env:
            update_sauce_jobs(current_test.name, current_test.testruns[-1].jobs, report.passed)
        if item.config.getoption('docker'):
@@ -443,7 +443,7 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
        self.channel_2 = self.community_2.get_channel(self.channel_name).click()

    @marks.testrail_id(702838)
-    @marks.xfail(reason="blocked by 14797")
+    # @marks.xfail(reason="blocked by 14797")
    def test_community_message_send_check_timestamps_sender_username(self):
        message = self.text_message
        sent_time_variants = self.channel_1.convert_device_time_to_chat_timestamp()