googleapis
diff --git a/‎samples/snippets/export_test.py
Lines changed: 37 additions & 12 deletions b/‎samples/snippets/export_test.py
Lines changed: 37 additions & 12 deletions
@@ -13,8 +13,10 @@
 # limitations under the License.
 
 import os
+import re
 import random
 import string
+import time
 
 import backoff
 from google.cloud import logging
@@ -24,8 +26,13 @@
 
 
 BUCKET = os.environ["CLOUD_STORAGE_BUCKET"]
-TEST_SINK_NAME_TMPL = "example_sink_{}"
+TEST_SINK_NAME_TMPL = "example_sink_{}_{}"
 TEST_SINK_FILTER = "severity>=CRITICAL"
+TIMESTAMP = int(time.time())
+
+# Threshold beyond which the cleanup_old_sinks fixture will delete
+# old sink, in seconds
+CLEANUP_THRESHOLD = 7200  # 2 hours
 
 
 def _random_id():
@@ -34,12 +41,36 @@ def _random_id():
     )
 
 
+def _create_sink_name():
+    return TEST_SINK_NAME_TMPL.format(TIMESTAMP, _random_id())
+
+
+@backoff.on_exception(backoff.expo, Exception, max_time=60, raise_on_giveup=False)
+def _delete_sink(sink):
+    sink.delete()
+
+
+# Runs once for entire test suite
+@pytest.fixture(scope="module")
+def cleanup_old_sinks():
+    client = logging.Client()
+    test_sink_name_regex = (
+        r"^" + TEST_SINK_NAME_TMPL.format(r"(\d+)", r"[A-Z0-9]{6}") + r"$"
+    )
+    for sink in client.list_sinks():
+        match = re.match(test_sink_name_regex, sink.name)
+        if match:
+            sink_timestamp = int(match.group(1))
+            if TIMESTAMP - sink_timestamp > CLEANUP_THRESHOLD:
+                _delete_sink(sink)
+
+
 @pytest.fixture
-def example_sink():
+def example_sink(cleanup_old_sinks):
     client = logging.Client()
 
     sink = client.sink(
-        TEST_SINK_NAME_TMPL.format(_random_id()),
+        _create_sink_name(),
         filter_=TEST_SINK_FILTER,
         destination="storage.googleapis.com/{bucket}".format(bucket=BUCKET),
     )
@@ -48,10 +79,7 @@ def example_sink():
 
     yield sink
 
-    try:
-        sink.delete()
-    except Exception:
-        pass
+    _delete_sink(sink)
 
 
 def test_list(example_sink, capsys):
@@ -65,16 +93,13 @@ def eventually_consistent_test():
 
 
 def test_create(capsys):
-    sink_name = TEST_SINK_NAME_TMPL.format(_random_id())
+    sink_name = _create_sink_name()
 
     try:
         export.create_sink(sink_name, BUCKET, TEST_SINK_FILTER)
     # Clean-up the temporary sink.
     finally:
-        try:
-            logging.Client().sink(sink_name).delete()
-        except Exception:
-            pass
+        _delete_sink(logging.Client().sink(sink_name))
 
     out, _ = capsys.readouterr()
     assert sink_name in out