a

Author: vitor-de-araujo

ddtrace/contrib/internal/pytest/_plugin_v2.py

@@ -119,13 +119,15 @@ def _handle_test_management(item, test_id):
     skipping mode.
     """
     is_quarantined = InternalTest.is_quarantined_test(test_id)
-    if is_quarantined:
-        # We add this information to user_properties to have it available in pytest_runtest_makereport().
-        item.user_properties += [(USER_PROPERTY_QUARANTINED, True)]
-
     is_disabled = InternalTest.is_disabled_test(test_id)
+
     if is_disabled:
+        # A test that is both disabled and quarantined should be skipped just like a regular disabled test.
+        # It should still have both disabled and quarantined event tags, though.
         item.add_marker(pytest.mark.skip(reason=DISABLED_BY_TEST_MANAGEMENT_REASON))
+    elif is_quarantined:
+        # We add this information to user_properties to have it available in pytest_runtest_makereport().
+        item.user_properties += [(USER_PROPERTY_QUARANTINED, True)]
 
 
 def _start_collecting_coverage() -> ModuleCodeCollector.CollectInContext:

tests/contrib/pytest/test_pytest_disabling.py

@@ -23,8 +23,12 @@
     _make_fqdn_internal_test_id("", "test_disabling.py", "test_disabled"): TestProperties(
         disabled=True
     ),
-    _make_fqdn_internal_test_id("", "test_disabling.py", "test_enabled"): TestProperties(
-        disabled=False
+    _make_fqdn_internal_test_id("", "test_disabling.py", "test_quarantined"): TestProperties(
+        quarantined=True
+    ),
+    _make_fqdn_internal_test_id("", "test_disabling.py", "test_disabled_and_quarantined"): TestProperties(
+        quarantined=True,
+        disabled=True,
     ),
 }
 
@@ -34,6 +38,12 @@
 def test_disabled():
     assert False
 
+def test_quarantined():
+    assert False
+
+def test_disabled_and_quarantined():
+    assert False
+
 def test_pass():
     assert True
 
@@ -76,7 +86,8 @@ def set_up_test_management(self):
     def test_disabling(self):
          self.testdir.makepyfile(test_disabling=_TESTS)
          rec = self.inline_run("--ddtrace", "-v")
-         assert_stats(rec, passed=1, failed=1, skipped=1)
+         assert rec.ret == 1
+         assert_stats(rec, passed=1, failed=1, skipped=2, quarantined=1)
 
 
     # def test_fail_quarantined_no_ddtrace_does_not_quarantine(self):