restore the hacks

Author: vitor-de-araujo

ddtrace/contrib/internal/pytest/_plugin_v2.py

@@ -1,3 +1,4 @@
+import os
 from pathlib import Path
 import re
 import typing as t
@@ -59,6 +60,7 @@
 from ddtrace.internal.test_visibility.api import InternalTestSession
 from ddtrace.internal.test_visibility.api import InternalTestSuite
 from ddtrace.internal.test_visibility.coverage_lines import CoverageLines
+from ddtrace.internal.utils.formats import asbool
 from ddtrace.vendor.debtcollector import deprecate
 
 
@@ -121,6 +123,10 @@ def _handle_test_management(item, test_id):
     is_quarantined = InternalTest.is_quarantined_test(test_id)
     is_disabled = InternalTest.is_disabled_test(test_id)
 
+    if is_quarantined and asbool(os.getenv("_DD_TEST_SKIP_QUARANTINED_TESTS")):
+        # For intenal use: treat quarantined tests as disabled.
+        is_disabled = True
+
     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.

ddtrace/internal/ci_visibility/api/_base.py

@@ -213,7 +213,7 @@ def _finish_span(self, override_finish_time: Optional[float] = None) -> None:
             self._session_settings.test_management_settings is not None
             and self._session_settings.test_management_settings.enabled
         ):
-            self._set_quarantine_tags()
+            self._set_test_management_tags()
 
         # Allow items to potentially overwrite default and hierarchy tags.
         self._set_item_tags()
@@ -280,7 +280,7 @@ def _set_atr_tags(self) -> None:
         """ATR tags are only set at the test level"""
         pass
 
-    def _set_quarantine_tags(self) -> None:
+    def _set_test_management_tags(self) -> None:
         """Quarantine tags are only set at the test or session level"""
         pass
 

ddtrace/internal/ci_visibility/api/_session.py

@@ -72,7 +72,7 @@ def _set_efd_tags(self):
         elif self.efd_is_faulty_session():
             self.set_tag(TEST_EFD_ABORT_REASON, "faulty")
 
-    def _set_quarantine_tags(self):
+    def _set_test_management_tags(self):
         self.set_tag(TEST_SESSION_QUARANTINE_ENABLED, True)
 
     def _set_itr_tags(self, itr_enabled: bool) -> None:

ddtrace/internal/ci_visibility/api/_test.py

@@ -22,8 +22,8 @@
 from ddtrace.internal.ci_visibility.constants import TEST
 from ddtrace.internal.ci_visibility.constants import TEST_EFD_ABORT_REASON
 from ddtrace.internal.ci_visibility.constants import TEST_HAS_FAILED_ALL_RETRIES
-from ddtrace.internal.ci_visibility.constants import TEST_IS_NEW
 from ddtrace.internal.ci_visibility.constants import TEST_IS_DISABLED
+from ddtrace.internal.ci_visibility.constants import TEST_IS_NEW
 from ddtrace.internal.ci_visibility.constants import TEST_IS_QUARANTINED
 from ddtrace.internal.ci_visibility.constants import TEST_IS_RETRY
 from ddtrace.internal.ci_visibility.telemetry.constants import EVENT_TYPES
@@ -133,9 +133,11 @@ def _set_atr_tags(self) -> None:
         if self._atr_is_retry:
             self.set_tag(TEST_IS_RETRY, self._atr_is_retry)
 
-    def _set_quarantine_tags(self) -> None:
+    def _set_test_management_tags(self) -> None:
         if self._is_quarantined:
             self.set_tag(TEST_IS_QUARANTINED, self._is_quarantined)
+        if self._is_disabled:
+            self.set_tag(TEST_IS_DISABLED, self._is_disabled)
 
     def _set_span_tags(self) -> None:
         """This handles setting tags that can't be properly stored in self._tags

ddtrace/internal/ci_visibility/constants.py

@@ -89,4 +89,4 @@ class REQUESTS_MODE(IntEnum):
 TEST_EFD_ENABLED = "test.early_flake.enabled"
 TEST_HAS_FAILED_ALL_RETRIES = "test.has_failed_all_retries"
 
-TEST_SESSION_QUARANTINE_ENABLED = "test_session.quarantine.enabled"
+TEST_SESSION_QUARANTINE_ENABLED = "test.test_management.enabled"

ddtrace/internal/ci_visibility/telemetry/git.py

@@ -62,7 +62,7 @@ def record_settings_response(
     itr_enabled: Optional[bool] = False,
     flaky_test_retries_enabled: Optional[bool] = False,
     early_flake_detection_enabled: Optional[bool] = False,
-    quarantine_enabled: Optional[bool] = False,
+    test_management_enabled: Optional[bool] = False,
 ) -> None:
     log.debug(
         "Recording settings telemetry:"
@@ -72,12 +72,14 @@ def record_settings_response(
         ", itr_enabled=%s"
         ", flaky_test_retries_enabled=%s"
         ", early_flake_detection_enabled=%s",
+        ", test_management_enabled=%s",
         coverage_enabled,
         skipping_enabled,
         require_git,
         itr_enabled,
         flaky_test_retries_enabled,
         early_flake_detection_enabled,
+        test_management_enabled,
     )
     # Telemetry "booleans" are true if they exist, otherwise false
     response_tags = []
@@ -93,8 +95,8 @@ def record_settings_response(
         response_tags.append(("flaky_test_retries_enabled", "true"))
     if early_flake_detection_enabled:
         response_tags.append(("early_flake_detection_enabled", "true"))
-    if quarantine_enabled:
-        response_tags.append(("quarantine_enabled", "true"))
+    if test_management_enabled:
+        response_tags.append(("test_management_enabled", "true"))
 
     if response_tags:
         telemetry_writer.add_count_metric(

ddtrace/internal/test_visibility/api.py

@@ -189,9 +189,7 @@ def is_quarantined_test(item_id: InternalTestId) -> bool:
     @_catch_and_log_exceptions
     def is_disabled_test(item_id: InternalTestId) -> bool:
         log.debug("Checking if test %s is disabled", item_id)
-        is_disabled = bool(
-            core.dispatch_with_results("test_visibility.test.is_disabled", (item_id,)).is_disabled.value
-        )
+        is_disabled = bool(core.dispatch_with_results("test_visibility.test.is_disabled", (item_id,)).is_disabled.value)
         log.debug("Test %s is disabled: %s", item_id, is_disabled)
         return is_disabled
 

tests/ci_visibility/api_client/test_ci_visibility_api_client_test_management_responses.py

@@ -57,14 +57,30 @@ def test_api_client_test_management_tests_parsed(self):
         mock_response = Response(200, json.dumps(response_dict))
 
         expected_tests = {
-            _make_fqdn_internal_test_id("module1", "suite1.py", "test1"): TestProperties(quarantined=True, disabled=False),
-            _make_fqdn_internal_test_id("module1", "suite1.py", "test2"): TestProperties(quarantined=False, disabled=False),
-            _make_fqdn_internal_test_id("module1", "suite1.py", "test3"): TestProperties(quarantined=False, disabled=False),
-            _make_fqdn_internal_test_id("module1", "suite1.py", "test4"): TestProperties(quarantined=False, disabled=False),
-            _make_fqdn_internal_test_id("module1", "suite2.py", "test1"): TestProperties(quarantined=False, disabled=True),
-            _make_fqdn_internal_test_id("module1", "suite2.py", "test5"): TestProperties(quarantined=True, disabled=False),
-            _make_fqdn_internal_test_id("module2", "suite1.py", "test1"): TestProperties(quarantined=False, disabled=False),
-            _make_fqdn_internal_test_id("module2", "suite1.py", "test2"): TestProperties(quarantined=False, disabled=False),
+            _make_fqdn_internal_test_id("module1", "suite1.py", "test1"): TestProperties(
+                quarantined=True, disabled=False
+            ),
+            _make_fqdn_internal_test_id("module1", "suite1.py", "test2"): TestProperties(
+                quarantined=False, disabled=False
+            ),
+            _make_fqdn_internal_test_id("module1", "suite1.py", "test3"): TestProperties(
+                quarantined=False, disabled=False
+            ),
+            _make_fqdn_internal_test_id("module1", "suite1.py", "test4"): TestProperties(
+                quarantined=False, disabled=False
+            ),
+            _make_fqdn_internal_test_id("module1", "suite2.py", "test1"): TestProperties(
+                quarantined=False, disabled=True
+            ),
+            _make_fqdn_internal_test_id("module1", "suite2.py", "test5"): TestProperties(
+                quarantined=True, disabled=False
+            ),
+            _make_fqdn_internal_test_id("module2", "suite1.py", "test1"): TestProperties(
+                quarantined=False, disabled=False
+            ),
+            _make_fqdn_internal_test_id("module2", "suite1.py", "test2"): TestProperties(
+                quarantined=False, disabled=False
+            ),
         }
 
         client = self._get_test_client()