Merge pull request #9051 from pradyunsg/fix-ci-issues

Workaround CI failures due to "pip search" throttling

.azure-pipelines/linux.yml

@@ -1,3 +1,6 @@
+variables:
+  CI: true
+
 jobs:
 - template: jobs/test.yml
   parameters:

.azure-pipelines/macos.yml

@@ -1,3 +1,6 @@
+variables:
+  CI: true
+
 jobs:
 - template: jobs/test.yml
   parameters:

.azure-pipelines/windows.yml

@@ -1,3 +1,6 @@
+variables:
+  CI: true
+
 jobs:
 - template: jobs/test-windows.yml
   parameters:

tests/conftest.py

@@ -63,10 +63,10 @@ def pytest_collection_modifyitems(config, items):
         if not hasattr(item, 'module'):  # e.g.: DoctestTextfile
             continue
 
-        # Mark network tests as flaky
-        if (item.get_closest_marker('network') is not None and
-                "CI" in os.environ):
-            item.add_marker(pytest.mark.flaky(reruns=3))
+        if "CI" in os.environ:
+            # Mark network tests as flaky
+            if item.get_closest_marker('network') is not None:
+                item.add_marker(pytest.mark.flaky(reruns=3, reruns_delay=2))
 
         if (item.get_closest_marker('fails_on_new_resolver') and
                 config.getoption("--new-resolver") and