From b42283f0b3acd79973dc4f77ed832c3b7ea6183c Mon Sep 17 00:00:00 2001
From: Erica Portnoy <ebportnoy@gmail.com>
Date: Thu, 20 Sep 2018 19:57:48 -0700
Subject: [PATCH] update boulder integration test to check for new behavior

---
 tests/certbot-boulder-integration.sh | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/tests/certbot-boulder-integration.sh b/tests/certbot-boulder-integration.sh
index 8a8e60798..e250e591b 100755
--- a/tests/certbot-boulder-integration.sh
+++ b/tests/certbot-boulder-integration.sh
@@ -440,25 +440,15 @@ for subdomain in $subdomains; do
     fi
 done
 
-# Test that revocation raises correct error if --cert-name and --cert-path don't match
+# Test that revocation raises correct error when both --cert-name and --cert-path specified
 common --domains le1.wtf
-common --domains le2.wtf
-out=$(common revoke --cert-path "$root/conf/live/le1.wtf/fullchain.pem" --cert-name "le2.wtf" 2>&1) || true
-if ! echo $out | grep "or both must point to the same certificate lineages."; then
-    echo "Non-interactive revoking with mismatched --cert-name and --cert-path "
+out=$(common revoke --cert-path "$root/conf/live/le1.wtf/fullchain.pem" --cert-name "le1.wtf" 2>&1) || true
+if ! echo $out | grep "Exactly one of --cert-path or --cert-name must be specified"; then
+    echo "Non-interactive revoking with both --cert-name and --cert-path "
     echo "did not raise the correct error!"
     exit 1
 fi
 
-# Revoking by matching --cert-name and --cert-path deletes
-common --domains le1.wtf
-common revoke --cert-path "$root/conf/live/le1.wtf/fullchain.pem" --cert-name "le1.wtf"
-out=$(common certificates)
-if echo $out | grep "le1.wtf"; then
-    echo "Cert le1.wtf should've been deleted! Was revoked via matching --cert-path & --cert-name"
-    exit 1
-fi
-
 # Test that revocation doesn't delete if multiple lineages share an archive dir
 common --domains le1.wtf
 common --domains le2.wtf