From 7237f78edfcf011755697e3fcc3ca20561ce1417 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Thu, 11 Jul 2024 13:06:01 -0600 Subject: [PATCH] Skip test case in pypy or windows (#3986) * Skip test case when running in Windows or Pypy Fixes #3985 * Use pytest-retry on flaky test case * Remove flaky * Use flaky instead * Revert "Use flaky instead" This reverts commit 4d433d658eb9eab0b9684ed58d7c7ca1e0ad3127. * Revert "Remove flaky" This reverts commit cc26486d272d44240d55fbd442099e9f3187258b. * Revert "Use pytest-retry on flaky test case" This reverts commit e96ea890086bf818bc5435f1ea32b0386c8f8231. * One last attempt with a forced delay * Revert "One last attempt with a forced delay" This reverts commit 75717d9fa0bf6a34ec1cca9f2624fb398d197b3d. * Fix comment * Fix zipp requirements * Remove flaky --- opentelemetry-sdk/tests/trace/export/test_export.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-sdk/tests/trace/export/test_export.py b/opentelemetry-sdk/tests/trace/export/test_export.py index 2ba76e9b41f..7a29ef3c42d 100644 --- 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"""