mirror of https://github.com/pypa/pip
Merge pull request #9051 from pradyunsg/fix-ci-issues
Workaround CI failures due to "pip search" throttling
This commit is contained in:
commit
cffc3a618e
|
@ -1,3 +1,6 @@
|
||||||
|
variables:
|
||||||
|
CI: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- template: jobs/test.yml
|
- template: jobs/test.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
variables:
|
||||||
|
CI: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- template: jobs/test.yml
|
- template: jobs/test.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
variables:
|
||||||
|
CI: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
- template: jobs/test-windows.yml
|
- template: jobs/test-windows.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
|
|
@ -63,10 +63,10 @@ def pytest_collection_modifyitems(config, items):
|
||||||
if not hasattr(item, 'module'): # e.g.: DoctestTextfile
|
if not hasattr(item, 'module'): # e.g.: DoctestTextfile
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Mark network tests as flaky
|
if "CI" in os.environ:
|
||||||
if (item.get_closest_marker('network') is not None and
|
# Mark network tests as flaky
|
||||||
"CI" in os.environ):
|
if item.get_closest_marker('network') is not None:
|
||||||
item.add_marker(pytest.mark.flaky(reruns=3))
|
item.add_marker(pytest.mark.flaky(reruns=3, reruns_delay=2))
|
||||||
|
|
||||||
if (item.get_closest_marker('fails_on_new_resolver') and
|
if (item.get_closest_marker('fails_on_new_resolver') and
|
||||||
config.getoption("--new-resolver") and
|
config.getoption("--new-resolver") and
|
||||||
|
|
Loading…
Reference in New Issue