Merge remote-tracking branch 'origin/master' into issue_2347

tests/boulder-integration.sh

@@ -27,6 +27,13 @@ common() {
         "$@"
 }
 
+common_no_force_renew() {
+    letsencrypt_test_no_force_renew \
+        --authenticator standalone \
+        --installer null \
+        "$@"
+}
+
 common --domains le1.wtf --standalone-supported-challenges tls-sni-01 auth
 common --domains le2.wtf --standalone-supported-challenges http-01 run
 common -a manual -d le.wtf auth
@@ -45,11 +52,11 @@ common --domains le3.wtf install \
        --key-path "${root}/csr/key.pem"
 
 # This won't renew (because it's not time yet)
-common renew
+letsencrypt_test_no_force_renew --authenticator standalone --installer null renew
 
-# This will renew
+# This will renew because the expiry is less than 10 years from now
 sed -i "4arenew_before_expiry = 10 years" "$root/conf/renewal/le1.wtf.conf"
-common renew
+letsencrypt_test_no_force_renew --authenticator standalone --installer null renew
 
 ls "$root/conf/archive/le1.wtf"
 # dir="$root/conf/archive/le1.wtf"

tests/integration/_common.sh

@@ -28,3 +28,20 @@ letsencrypt_test () {
         -vvvvvvv \
         "$@"
 }
+
+letsencrypt_test_no_force_renew () {
+    letsencrypt \
+        --server "${SERVER:-http://localhost:4000/directory}" \
+        --no-verify-ssl \
+        --tls-sni-01-port 5001 \
+        --http-01-port 5002 \
+        --manual-test-mode \
+        $store_flags \
+        --text \
+        --no-redirect \
+        --agree-tos \
+        --register-unsafely-without-email \
+        --debug \
+        -vvvvvvv \
+        "$@"
+}