XENG-8985 Add flaky test decorator to flaky tests

Author: Jacob Truman

requirements.txt

@@ -1,9 +1,10 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile
 #
+--extra-index-url https://artifactory.corp.adobe.com/artifactory/api/pypi/pypi-releng/simple
 
 annotated-types==0.7.0
     # via pydantic
@@ -34,7 +35,7 @@ deprecated==1.2.18
     # via fabric
 docker==7.1.0
     # via -r requirements.in
-docutils==0.20.1
+docutils==0.21.2
     # via readme-renderer
 fabric==3.2.2
     # via -r requirements.in
@@ -50,11 +51,7 @@ id==1.5.0
     # via twine
 idna==3.10
     # via requests
-importlib-metadata==8.5.0
-    # via
-    #   keyring
-    #   twine
-importlib-resources==6.4.5
+importlib-metadata==8.6.1
     # via keyring
 invoke==2.2.0
     # via fabric
@@ -66,15 +63,15 @@ jaraco-functools==4.1.0
     # via keyring
 jinja2==3.1.6
     # via -r requirements.in
-keyring==25.5.0
+keyring==25.6.0
     # via twine
 markdown-it-py==3.0.0
     # via rich
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
-more-itertools==10.5.0
+more-itertools==10.6.0
     # via
     #   jaraco-classes
     #   jaraco-functools
@@ -86,7 +83,7 @@ paramiko==3.5.1
     # via
     #   -r requirements.in
     #   fabric
-portalocker==3.0.0
+portalocker==3.1.1
     # via -r requirements.in
 pycparser==2.22
     # via cffi
@@ -102,11 +99,11 @@ pygments==2.19.1
     #   rich
 pynacl==1.5.0
     # via paramiko
-python-on-whales==0.75.1
+python-on-whales==0.76.1
     # via -r requirements.in
 pyyaml==6.0.2
     # via -r requirements.in
-readme-renderer==43.0
+readme-renderer==44.0
     # via twine
 requests==2.32.3
     # via
@@ -133,12 +130,10 @@ twine==6.1.0
     # via -r requirements.in
 typing-extensions==4.13.0
     # via
-    #   annotated-types
     #   pydantic
     #   pydantic-core
     #   python-on-whales
-    #   rich
-urllib3==2.2.3
+urllib3==2.3.0
     # via
     #   docker
     #   requests
@@ -147,7 +142,5 @@ vcsinfo==2.1.110
     # via -r requirements.in
 wrapt==1.17.2
     # via deprecated
-zipp==3.20.2
-    # via
-    #   importlib-metadata
-    #   importlib-resources
+zipp==3.21.0
+    # via importlib-metadata

test_requirements.in

@@ -3,6 +3,7 @@ pytest-randomly>=3.5.0
 pytest-retry>=1.7.0
 pytest-cov>=2.10.1
 pytest-xdist>=2.4.0
+flaky>=3.8.1
 graphlib-backport>=1.0.3
 ruff>=0.1.7
 ruff-lsp>=0.0.45

test_requirements.txt

@@ -4,6 +4,7 @@
 #
 #    pip-compile --output-file=test_requirements.txt test_requirements.in
 #
+--extra-index-url https://artifactory.corp.adobe.com/artifactory/api/pypi/pypi-releng/simple
 
 attrs==23.1.0
     # via
@@ -21,6 +22,8 @@ execnet==1.9.0
     # via pytest-xdist
 filelock==3.13.1
     # via virtualenv
+flaky==3.8.1
+    # via -r test_requirements.in
 graphlib-backport==1.0.3
     # via -r test_requirements.in
 identify==2.5.33

tests/test_utils_flock.py

@@ -54,6 +54,7 @@ def _wait_and_set(event: Event, sleep_seconds: float):
     event.set()
 
 
+@pytest.mark.flaky(retries=3)
 def test_flock_acquire1(mock_logger, tmp_path):
     try:
         fd = None
@@ -68,6 +69,7 @@ def test_flock_acquire1(mock_logger, tmp_path):
             release_flock(fd, mock_logger)
 
 
+@pytest.mark.flaky(retries=3)
 def test_flock_exclusive_acquire(mock_logger, tmp_path):
     try:
         lock_file = str(tmp_path / "mylock.file")
@@ -129,6 +131,7 @@ def test_flock_exclusive_acquire(mock_logger, tmp_path):
             release_flock(fd, mock_logger)
 
 
+@pytest.mark.flaky(retries=3)
 def test_flock_release(mock_logger, tmp_path):
     fd = None
     try:
@@ -155,6 +158,7 @@ def test_flock_release(mock_logger, tmp_path):
             release_flock(fd, mock_logger)
 
 
+@pytest.mark.flaky(retries=3)
 def test_flock_acquire_exclusive_timeout(mock_logger, tmp_path):
     try:
         lock_file = str(tmp_path / "mylock.file")
@@ -242,6 +246,7 @@ def test_flock_acquire_exclusive_timeout(mock_logger, tmp_path):
             release_flock(fd, mock_logger)
 
 
+@pytest.mark.flaky(retries=3)
 def test_flock_shared_acquire(mock_logger, tmp_path):
     try:
         lock_file = str(tmp_path / "mylock.file")