add pytest-timeout

acme/setup.py

@@ -23,6 +23,7 @@ docs_extras = [
 
 test_extras = [
     'pytest',
+    'pytest-timeout',
     'pytest-xdist',
     'typing-extensions',
 ]

certbot/setup.py

@@ -89,6 +89,7 @@ test_extras = [
     'pylint',
     'pytest',
     'pytest-cov',
+    'pytest-timeout',
     'pytest-xdist',
     'setuptools',
     'tox',

pytest.ini

@@ -38,3 +38,6 @@ filterwarnings =
     ignore:.*attribute in acme.client is deprecated:DeprecationWarning
     ignore:.*acme.mixins is deprecated:DeprecationWarning
     ignore:.*Authorization.combinations is deprecated:DeprecationWarning
+# If an individual test takes more than 5 minutes (300 seconds), I think we can
+# assume something has gone very wrong.
+timeout = 300

tools/oldest_constraints.txt

@@ -3,24 +3,23 @@
 apacheconfig==0.3.2
 asn1crypto==0.24.0
 astroid==2.11.7; python_version >= "3.7"
-atomicwrites==1.4.1; sys_platform == "win32" and python_version >= "3.7"
 attrs==22.1.0; python_version >= "3.7"
-bcrypt==3.2.2; python_version >= "3.7"
+bcrypt==4.0.0; python_version >= "3.7"
 boto3==1.15.15
 botocore==1.18.15
 cached-property==1.5.2; python_version >= "3.7"
-certifi==2022.6.15; python_version >= "3.7"
+certifi==2022.9.24; python_version >= "3.7"
 cffi==1.9.1
 chardet==3.0.4
 cloudflare==1.5.1
 colorama==0.4.5; sys_platform == "win32" and python_version >= "3.7"
 configargparse==0.10.0
 configobj==5.0.6
-coverage==6.4.2; python_version >= "3.7"
+coverage==6.5.0; python_version >= "3.7"
 cryptography==3.2.1
-cython==0.29.31
+cython==0.29.32
 dill==0.3.5.1; python_version >= "3.7"
-distlib==0.3.5; python_version >= "3.7"
+distlib==0.3.6; python_version >= "3.7"
 distro==1.0.1
 dns-lexicon==3.2.1
 dnspython==1.15.0
@@ -29,13 +28,13 @@ docker==4.2.2; python_version >= "3.7"
 dockerpty==0.4.1; python_version >= "3.7"
 docopt==0.6.2; python_version >= "3.7"
 execnet==1.9.0; python_version >= "3.7"
-filelock==3.7.1; python_version >= "3.7"
+filelock==3.8.0; python_version >= "3.7"
 funcsigs==0.4
 future==0.18.2; python_version >= "3.7"
 google-api-python-client==1.5.5
 httplib2==0.9.2
 idna==2.6
-importlib-metadata==4.12.0; python_version < "3.8" and python_version >= "3.7"
+importlib-metadata==5.0.0; python_version < "3.8" and python_version >= "3.7"
 iniconfig==1.1.1; python_version >= "3.7"
 ipaddress==1.0.16
 isort==5.10.1; python_version >= "3.7" and python_version < "4.0"
@@ -47,14 +46,14 @@ logger==1.4; python_version >= "3.7"
 mccabe==0.7.0; python_version >= "3.7"
 mock==1.0.1
 mypy-extensions==0.4.3; python_version >= "3.7"
-mypy==0.971; python_version >= "3.7"
+mypy==0.982; python_version >= "3.7"
 ndg-httpsclient==0.3.2
 oauth2client==4.0.0
 packaging==21.3; python_version >= "3.7"
 paramiko==2.11.0; python_version >= "3.7"
 parsedatetime==2.4
 pbr==1.8.0
-pip==22.2.1; python_version >= "3.7"
+pip==22.2.2; python_version >= "3.7"
 platformdirs==2.5.2; python_version >= "3.7"
 pluggy==1.0.0; python_version >= "3.7"
 ply==3.4
@@ -69,10 +68,11 @@ pyparsing==2.2.1
 pypiwin32==223; sys_platform == "win32" and python_version >= "3.7"
 pyrfc3339==1.0
 pyrsistent==0.18.1; python_version >= "3.7"
-pytest-cov==3.0.0; python_version >= "3.7"
+pytest-cov==4.0.0; python_version >= "3.7"
 pytest-forked==1.4.0; python_version >= "3.7"
+pytest-timeout==2.1.0; python_version >= "3.7"
 pytest-xdist==2.5.0; python_version >= "3.7"
-pytest==7.1.2; python_version >= "3.7"
+pytest==7.1.3; python_version >= "3.7"
 python-augeas==0.5.0
 python-dateutil==2.8.2; python_version >= "3.7"
 python-digitalocean==1.11
@@ -87,24 +87,24 @@ s3transfer==0.3.7; python_version >= "3.7"
 setuptools==41.6.0
 six==1.11.0
 texttable==1.6.4; python_version >= "3.7"
-tldextract==3.3.1; python_version >= "3.7"
+tldextract==3.4.0; python_version >= "3.7"
 tomli==2.0.1; python_version < "3.11" and python_version >= "3.7" or python_full_version <= "3.11.0a6" and python_version >= "3.7" or python_version >= "3.7"
 tox==1.9.2; python_version >= "3.7"
 typed-ast==1.5.4; python_version >= "3.7" and python_version < "3.8" or implementation_name == "cpython" and python_version < "3.8" and python_version >= "3.7"
-types-cryptography==3.3.21; python_version >= "3.7"
+types-cryptography==3.3.23; python_version >= "3.7"
 types-mock==4.0.15; python_version >= "3.7"
-types-pyopenssl==22.0.9; python_version >= "3.7"
+types-pyopenssl==22.1.0.0; python_version >= "3.7"
 types-pyrfc3339==1.1.1; python_version >= "3.7"
 types-python-dateutil==2.8.19; python_version >= "3.7"
-types-pytz==2022.1.2; python_version >= "3.7"
-types-requests==2.28.5; python_version >= "3.7"
-types-setuptools==63.2.2; python_version >= "3.7"
-types-six==1.16.18; python_version >= "3.7"
-types-urllib3==1.26.17; python_version >= "3.7"
-typing-extensions==4.3.0; python_version >= "3.7" or python_version < "3.10" and python_version >= "3.7" or python_version < "3.8" and python_version >= "3.7"
+types-pytz==2022.4.0.0; python_version >= "3.7"
+types-requests==2.28.11.2; python_version >= "3.7"
+types-setuptools==65.4.0.0; python_version >= "3.7"
+types-six==1.16.21; python_version >= "3.7"
+types-urllib3==1.26.25; python_version >= "3.7"
+typing-extensions==4.4.0; python_version >= "3.7" or python_version < "3.10" and python_version >= "3.7" or python_version < "3.8" and python_version >= "3.7"
 uritemplate==3.0.1; python_version >= "3.7"
 urllib3==1.24.2
-virtualenv==20.16.2; python_version >= "3.7"
+virtualenv==20.16.5; python_version >= "3.7"
 websocket-client==0.59.0; python_version >= "3.7"
 wheel==0.33.6
 wheel==0.33.6; python_version >= "3.7"

tools/requirements.txt

@@ -11,29 +11,29 @@ appdirs==1.4.4; python_version >= "3.7" and python_version < "4.0"
 appnope==0.1.3; python_version >= "3.7" and sys_platform == "darwin"
 astroid==2.11.7; python_version >= "3.7"
 attrs==22.1.0; python_version >= "3.7"
-awscli==1.25.76
-awscli==1.25.76; python_version >= "3.7"
+awscli==1.25.89
+awscli==1.25.89; python_version >= "3.7"
 azure-devops==6.0.0b4; python_version >= "3.7"
 babel==2.10.3; python_version >= "3.7"
 backcall==0.2.0; python_version >= "3.7"
 bcrypt==4.0.0; python_version >= "3.7"
 beautifulsoup4==4.11.1; python_version >= "3.7"
 bleach==5.0.1; python_version >= "3.7"
-boto3==1.24.75; python_version >= "3.7"
-botocore==1.27.75; python_version >= "3.7"
+boto3==1.24.88; python_version >= "3.7"
+botocore==1.27.88; python_version >= "3.7"
 cachecontrol==0.12.12; python_version >= "3.7" and python_version < "4.0"
 cached-property==1.5.2; python_version < "3.8" and python_version >= "3.7"
 cachetools==5.2.0; python_version >= "3.7" and python_version < "4.0"
 cachy==0.3.0; python_version >= "3.7" and python_version < "4.0"
-certifi==2022.9.14; python_version >= "3.7" and python_version < "4" or python_version >= "3.7"
+certifi==2022.9.24; python_version >= "3.7" and python_version < "4" or python_version >= "3.7"
 cffi==1.15.1; python_version >= "3.7"
 charset-normalizer==2.1.1; python_version >= "3.7" and python_version < "4"
 cleo==1.0.0a5; python_version >= "3.7" and python_version < "4.0"
-cloudflare==2.10.1; python_version >= "3.7"
+cloudflare==2.10.2; python_version >= "3.7"
 colorama==0.4.4; python_version >= "3.7"
 configargparse==1.5.3; python_version >= "3.7"
 configobj==5.0.6; python_version >= "3.7"
-coverage==6.4.4; python_version >= "3.7"
+coverage==6.5.0; python_version >= "3.7"
 crashtest==0.3.1; python_version >= "3.7" and python_version < "4.0"
 cryptography==38.0.1
 cryptography==38.0.1; python_version >= "3.7"
@@ -54,9 +54,9 @@ execnet==1.9.0; python_version >= "3.7"
 fabric==2.7.1; python_version >= "3.7"
 filelock==3.8.0; python_version >= "3.7" or python_version >= "3.7" and python_version < "4.0"
 google-api-core==2.10.1; python_version >= "3.7"
-google-api-python-client==2.61.0; python_version >= "3.7"
+google-api-python-client==2.64.0; python_version >= "3.7"
 google-auth-httplib2==0.1.0; python_version >= "3.7"
-google-auth==2.11.0; python_version >= "3.7"
+google-auth==2.12.0; python_version >= "3.7"
 googleapis-common-protos==1.56.4; python_version >= "3.7"
 html5lib==1.1; python_version >= "3.7" and python_version < "4.0"
 httplib2==0.20.4; python_version >= "3.7"
@@ -64,7 +64,7 @@ idna==3.4; python_version >= "3.7" and python_version < "4" or python_version >=
 imagesize==1.4.1; python_version >= "3.7"
 importlib-metadata==1.7.0; python_version >= "3.7" and python_version < "3.8"
 iniconfig==1.1.1; python_version >= "3.7"
-invoke==1.7.1; python_version >= "3.7"
+invoke==1.7.3; python_version >= "3.7"
 ipdb==0.13.9; python_version >= "3.7"
 ipython==7.34.0; python_version >= "3.7"
 isodate==0.6.1; python_version >= "3.7"
@@ -86,7 +86,7 @@ mock==4.0.3
 msgpack==1.0.4; python_version >= "3.7" and python_version < "4.0"
 msrest==0.6.21; python_version >= "3.7"
 mypy-extensions==0.4.3; python_version >= "3.7"
-mypy==0.971; python_version >= "3.7"
+mypy==0.982; python_version >= "3.7"
 oauth2client==4.1.3; python_version >= "3.7"
 oauthlib==3.2.1; python_version >= "3.7"
 packaging==20.9; python_version >= "3.7"
@@ -104,7 +104,7 @@ ply==3.11; python_version >= "3.7"
 poetry-core==1.1.0a7
 poetry==1.2.0a2
 prompt-toolkit==3.0.31; python_version >= "3.7"
-protobuf==4.21.6; python_version >= "3.7"
+protobuf==4.21.7; python_version >= "3.7"
 ptyprocess==0.7.0; python_version >= "3.7" and python_version < "4.0"
 py==1.11.0; python_version >= "3.7"
 pyasn1-modules==0.2.8; python_version >= "3.7"
@@ -115,23 +115,24 @@ pylev==1.4.0; python_version >= "3.7" and python_version < "4.0"
 pylint==2.13.9
 pynacl==1.5.0; python_version >= "3.7"
 pynsist==2.7; python_version >= "3.7"
-pyopenssl==22.0.0; python_version >= "3.7"
+pyopenssl==22.1.0; python_version >= "3.7"
 pyparsing==3.0.9; python_version >= "3.7"
 pyrfc3339==1.1; python_version >= "3.7"
 pyrsistent==0.18.1; python_version >= "3.7"
-pytest-cov==3.0.0; python_version >= "3.7"
+pytest-cov==4.0.0; python_version >= "3.7"
 pytest-forked==1.4.0; python_version >= "3.7"
+pytest-timeout==2.1.0; python_version >= "3.7"
 pytest-xdist==2.5.0; python_version >= "3.7"
 pytest==7.1.3; python_version >= "3.7"
 python-augeas==1.1.0; python_version >= "3.7"
 python-dateutil==2.8.2; python_version >= "3.7"
 python-digitalocean==1.17.0; python_version >= "3.7"
 python-dotenv==0.21.0; python_version >= "3.7"
-pytz==2022.2.1; python_version >= "3.7"
+pytz==2022.4; python_version >= "3.7"
 pywin32-ctypes==0.2.0; python_version >= "3.7" and python_version < "4.0" and sys_platform == "win32"
 pywin32==304; sys_platform == "win32" and python_version >= "3.7"
 pyyaml==5.4.1; python_version >= "3.7"
-readme-renderer==37.1; python_version >= "3.7"
+readme-renderer==37.2; python_version >= "3.7"
 requests-download==0.1.2; python_version >= "3.7"
 requests-file==1.5.1; python_version >= "3.7" and python_version < "4.0"
 requests-oauthlib==1.3.1; python_version >= "3.7"
@@ -142,8 +143,8 @@ rsa==4.7.2; python_version >= "3.7" and python_version < "4"
 s3transfer==0.6.0; python_version >= "3.7"
 secretstorage==3.3.3; python_version >= "3.7" and python_version < "4.0" and sys_platform == "linux"
 semantic-version==2.10.0; python_version >= "3.7"
-setuptools-rust==1.5.1
-setuptools==65.3.0; python_version >= "3.7"
+setuptools-rust==1.5.2
+setuptools==65.4.1; python_version >= "3.7"
 shellingham==1.5.0; python_version >= "3.7" and python_version < "4.0"
 six==1.16.0; python_version >= "3.7"
 snowballstemmer==2.2.0; python_version >= "3.7"
@@ -157,10 +158,10 @@ sphinxcontrib-jsmath==1.0.1; python_version >= "3.7"
 sphinxcontrib-qthelp==1.0.3; python_version >= "3.7"
 sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.7"
 texttable==1.6.4; python_version >= "3.7"
-tldextract==3.3.1; python_version >= "3.7" and python_version < "4.0"
+tldextract==3.4.0; python_version >= "3.7" and python_version < "4.0"
 toml==0.10.2; python_version >= "3.7"
 tomli==2.0.1; python_version < "3.11" and python_version >= "3.7" or python_full_version <= "3.11.0a6" and python_version >= "3.7" or python_version >= "3.7"
-tomlkit==0.11.4; python_version >= "3.7" and python_version < "4.0"
+tomlkit==0.11.5; python_version >= "3.7" and python_version < "4.0"
 tox==3.26.0; python_version >= "3.7"
 tqdm==4.64.1; python_version >= "3.7"
 traitlets==5.4.0; python_version >= "3.7"
@@ -168,15 +169,15 @@ twine==3.3.0; python_version >= "3.7"
 typed-ast==1.5.4; python_version >= "3.7" and python_version < "3.8" or implementation_name == "cpython" and python_version < "3.8" and python_version >= "3.7"
 types-cryptography==3.3.23; python_version >= "3.7"
 types-mock==4.0.15; python_version >= "3.7"
-types-pyopenssl==22.0.10; python_version >= "3.7"
+types-pyopenssl==22.1.0.0; python_version >= "3.7"
 types-pyrfc3339==1.1.1; python_version >= "3.7"
 types-python-dateutil==2.8.19; python_version >= "3.7"
-types-pytz==2022.2.1.0; python_version >= "3.7"
-types-requests==2.28.10; python_version >= "3.7"
-types-setuptools==65.3.0; python_version >= "3.7"
-types-six==1.16.19; python_version >= "3.7"
-types-urllib3==1.26.24; python_version >= "3.7"
-typing-extensions==4.3.0; python_version >= "3.7" or python_version < "3.10" and python_version >= "3.7" or python_version < "3.8" and python_version >= "3.7"
+types-pytz==2022.4.0.0; python_version >= "3.7"
+types-requests==2.28.11.2; python_version >= "3.7"
+types-setuptools==65.4.0.0; python_version >= "3.7"
+types-six==1.16.21; python_version >= "3.7"
+types-urllib3==1.26.25; python_version >= "3.7"
+typing-extensions==4.4.0; python_version >= "3.7" or python_version < "3.10" and python_version >= "3.7" or python_version < "3.8" and python_version >= "3.7"
 uritemplate==4.1.1; python_version >= "3.7"
 urllib3==1.26.12; python_version >= "3.7" and python_version < "4"
 virtualenv==20.4.4; python_version >= "3.7" and python_version < "4.0" or python_version >= "3.7"