Merge branch 'main' into issue_3678

open-telemetry · Jul 11, 2024 · 8e35ca0 · 8e35ca0
2 parents 75cc000 + 7237f78
commit 8e35ca0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py
@@ -462,8 +462,8 @@ def _target():
         span_processor.shutdown()
 
     @mark.skipif(
-        python_implementation() == "PyPy" and system() == "Windows",
-        reason="This test randomly fails with huge delta in Windows with PyPy",
+        python_implementation() == "PyPy" or system() == "Windows",
+        reason="This test randomly fails with huge delta in Windows or PyPy",
     )
     def test_batch_span_processor_scheduled_delay(self):
         """Test that spans are exported each schedule_delay_millis"""