From c279ee59a899465043dff4a4310082c726702f62 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Tue, 31 Aug 2021 00:17:58 +0200
Subject: [PATCH] Rerun a flaky test (#639)

* Rerun a flaky test
---
 .../tests/celery/test_celery_functional.py        | 15 +++++++++------
 tox.ini                                           |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py b/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py
index 45ffbbe389..c85952aa7d 100644
--- a/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py
+++ b/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py
@@ -14,8 +14,9 @@
 
 
 import celery
-import pytest
 from celery.exceptions import Retry
+from flaky import flaky
+from pytest import mark
 
 import opentelemetry.instrumentation.celery
 from opentelemetry import trace as trace_api
@@ -33,7 +34,7 @@ class MyException(Exception):
     pass
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_instrumentation_info(celery_app, memory_exporter):
     @celery_app.task
     def fn_task():
@@ -143,7 +144,7 @@ def fn_task(self):
     assert span.attributes.get("celery.state") == "SUCCESS"
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_fn_task_apply_async(celery_app, memory_exporter):
     @celery_app.task
     def fn_task_parameters(user, force_logout=False):
@@ -190,7 +191,7 @@ def fn_task_parameters(user, force_logout=False):
     )
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_concurrent_delays(celery_app, memory_exporter):
     @celery_app.task
     def fn_task():
@@ -206,7 +207,7 @@ def fn_task():
     assert len(spans) == 200
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_fn_task_delay(celery_app, memory_exporter):
     @celery_app.task
     def fn_task_parameters(user, force_logout=False):
@@ -476,7 +477,7 @@ def add(x, y):
     )
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_apply_async_previous_style_tasks(
     celery_app, celery_worker, memory_exporter
 ):
@@ -558,6 +559,8 @@ class CelerySubClass(CelerySuperClass):
     ) == async_run_span.attributes.get(SpanAttributes.MESSAGING_MESSAGE_ID)
 
 
+# FIXME find a permanent solution for the flakiness of this test
+@flaky
 def test_custom_tracer_provider(celery_app, memory_exporter):
     @celery_app.task
     def fn_task():
diff --git a/tox.ini b/tox.ini
index 50fca6d6b8..70a8968607 100644
--- a/tox.ini
+++ b/tox.ini
@@ -408,6 +408,7 @@ deps =
   protobuf>=3.13.0
   requests==2.25.0
   pyodbc~=4.0.30
+  flaky==3.7.0
 
 changedir =
   tests/opentelemetry-docker-tests/tests