From 8b02f485b02e2170a140a5fc07bacf5e1916e658 Mon Sep 17 00:00:00 2001
From: Seth Schoen <schoen@eff.org>
Date: Fri, 5 Feb 2016 17:13:30 -0800
Subject: [PATCH] Have a way not to force renewal in integration test

---
 tests/boulder-integration.sh | 16 +++++++++++-----
 tests/integration/_common.sh | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh
index 294522e05..b6c76ee22 100755
--- a/tests/boulder-integration.sh
+++ b/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
@@ -44,13 +51,12 @@ common --domains le3.wtf install \
        --cert-path "${root}/csr/cert.pem" \
        --key-path "${root}/csr/key.pem"
 
-# This won't renew (because it's not time yet) - not using common because
-# common forces renewal
-letsencrypt_test --authenticator standalone --installer null renew
+# This won't renew (because it's not time yet)
+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"
-letsencrypt_test --authenticator standalone --installer null renew
+letsencrypt_test_no_force_renew --authenticator standalone --installer null renew
 
 ls "$root/conf/archive/le1.wtf"
 # dir="$root/conf/archive/le1.wtf"
diff --git a/tests/integration/_common.sh b/tests/integration/_common.sh
index 4572b0fb3..f133600a0 100755
--- a/tests/integration/_common.sh
+++ b/tests/integration/_common.sh
@@ -28,3 +28,21 @@ 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 \
+        --renew-by-default \
+        --debug \
+        -vvvvvvv \
+        "$@"
+}