duplication--

tests/boulder-integration.sh

@@ -20,17 +20,16 @@ else
   readlink="readlink"
 fi
 
-common() {
+common_no_force_renew() {
-    letsencrypt_test \
+    letsencrypt_test_no_force_renew \
         --authenticator standalone \
         --installer null \
         "$@"
 }
 
-common_no_force_renew() {
+common() {
-    letsencrypt_test_no_force_renew \
+    common_no_force_renew \
-        --authenticator standalone \
+        --renew-by-default \
-        --installer null \
         "$@"
 }
 

tests/integration/_common.sh

@@ -12,21 +12,8 @@ store_flags="$store_flags --logs-dir $root/logs"
 export root store_flags
 
 letsencrypt_test () {
-    letsencrypt \
+    letsencrypt_test_no_force_renew \
-        --server "${SERVER:-http://localhost:4000/directory}" \
+        --renew-by-default
-        --no-verify-ssl \
-        --tls-sni-01-port 5001 \
-        --http-01-port 5002 \
-        --manual-test-mode \
-        $store_flags \
-        --non-interactive \
-        --no-redirect \
-        --agree-tos \
-        --register-unsafely-without-email \
-        --renew-by-default \
-        --debug \
-        -vvvvvvv \
-        "$@"
 }
 
 letsencrypt_test_no_force_renew () {