test: Work around integration failures & flake (#8393)

- Avoid acme (python) 5.0.0, which removed acme.challenges.TLSALPN01
- Retry after badNonce errors

Fixes #8385

Author: jprenken

test/boulder-tools/requirements.txt

@@ -1,4 +1,4 @@
-acme>=2.0
-cryptography>=0.7
+acme >= 2.0, < 5.0.0
+cryptography >= 0.7
 PyOpenSSL
 requests

test/chisel2.py

@@ -142,13 +142,21 @@ def auth_and_issue(domains, chall_type="dns-01", email=None, cert_output=None, c
     else:
         raise Exception("invalid challenge type %s" % chall_type)
 
-    try:
-        order = client.poll_and_finalize(order)
-        if cert_output is not None:
-            with open(cert_output, "w") as f:
-                f.write(order.fullchain_pem)
-    finally:
-        cleanup()
+    # Retry up to twice upon badNonce errors
+    for n in range(2):
+        try:
+            order = client.poll_and_finalize(order)
+            if cert_output is not None:
+                with open(cert_output, "w") as f:
+                    f.write(order.fullchain_pem)
+        except messages.Error as e:
+            if e.typ == "urn:ietf:params:acme:error:badNonce":
+                time.sleep(0.01)
+                continue
+        else:
+            break
+        finally:
+            cleanup()
 
     return order
 
@@ -234,8 +242,15 @@ def expect_problem(problem_type, func):
     if len(domains) == 0:
         print(__doc__)
         sys.exit(0)
-    try:
-        auth_and_issue(domains)
-    except messages.Error as e:
-        print(e)
-        sys.exit(1)
+    # Retry up to twice upon badNonce errors
+    for n in range(2):
+        try:
+            auth_and_issue(domains)
+        except messages.Error as e:
+            if e.typ == "urn:ietf:params:acme:error:badNonce":
+                time.sleep(0.01)
+                continue
+            print(e)
+            sys.exit(1)
+        else:
+            break