From 82db58a3581f72b3b6035ecfecaa4ff11e41d5c9 Mon Sep 17 00:00:00 2001
From: mukund-ananthu <mukundananthu@google.com>
Date: Thu, 7 Nov 2024 16:48:53 +0000
Subject: [PATCH] fix: Replace flaky with pytest.mark.flaky

---
 noxfile.py                                              | 4 +---
 owlbot.py                                               | 1 -
 tests/unit/pubsub_v1/publisher/test_publisher_client.py | 8 +-------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 7bae0161f..2ccbfeae7 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -54,9 +54,7 @@
 ]
 UNIT_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
 UNIT_TEST_LOCAL_DEPENDENCIES: List[str] = []
-UNIT_TEST_DEPENDENCIES: List[str] = [
-    "flaky",
-]
+UNIT_TEST_DEPENDENCIES: List[str] = []
 UNIT_TEST_EXTRAS: List[str] = []
 UNIT_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
 
diff --git a/owlbot.py b/owlbot.py
index 5828fbecf..2e4b00bc9 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -337,7 +337,6 @@
     cov_level=100,
     versions=gcp.common.detect_versions(path="./google", default_first=True),
     unit_test_python_versions=["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
-    unit_test_dependencies=["flaky"],
     system_test_python_versions=["3.12"],
     system_test_external_dependencies=["psutil","flaky"],
 )
diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
index 55198b590..dc3a0dc09 100644
--- a/tests/unit/pubsub_v1/publisher/test_publisher_client.py
+++ b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -28,8 +28,6 @@
 
 import pytest
 import time
-from flaky import flaky
-from typing import cast, Callable, Any, TypeVar
 
 from opentelemetry import trace
 from google.api_core import gapic_v1
@@ -51,10 +49,6 @@
 )
 
 
-C = TypeVar("C", bound=Callable[..., Any])
-typed_flaky = cast(Callable[[C], C], flaky(max_runs=5, min_passes=1))
-
-
 def _assert_retries_equal(retry, retry2):
     # Retry instances cannot be directly compared, because their predicates are
     # different instances of the same function. We thus manually compare their other
@@ -148,7 +142,7 @@ def test_init_w_custom_transport(creds):
         False,
     ],
 )
-@typed_flaky
+@pytest.mark.flaky(retries=5)
 def test_open_telemetry_publisher_options(creds, enable_open_telemetry):
     if sys.version_info >= (3, 8) or enable_open_telemetry is False:
         client = publisher.Client(