Disable defunct tests for to-be-deleted components

Author: aarongable

cmd/contact-auditor/main_test.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/jmhodges/clock"
+
 	corepb "github.com/letsencrypt/boulder/core/proto"
 	"github.com/letsencrypt/boulder/db"
 	blog "github.com/letsencrypt/boulder/log"
@@ -33,6 +34,11 @@ const (
 )
 
 func TestContactAuditor(t *testing.T) {
+	// Leave this technically in place until contact-auditor is fully deleted, but
+	// this test cannot function now that the SA never stores nor retrieves
+	// contacts.
+	t.Skip()
+
 	testCtx := setup(t)
 	defer testCtx.cleanUp()
 

cmd/expiration-mailer/main_test.go

@@ -417,6 +417,11 @@ func TestProcessCertsConnectError(t *testing.T) {
 }
 
 func TestFindExpiringCertificates(t *testing.T) {
+	// Leave this technically in place until expiration-mailer is fully deleted,
+	// but this test cannot function now that the SA never stores nor retrieves
+	// contacts.
+	t.Skip()
+
 	testCtx := setup(t, []time.Duration{time.Hour * 24, time.Hour * 24 * 4, time.Hour * 24 * 7})
 
 	addExpiringCerts(t, testCtx)
@@ -620,6 +625,11 @@ func countGroupsAtCapacity(group string, counter *prometheus.GaugeVec) int {
 }
 
 func TestFindCertsAtCapacity(t *testing.T) {
+	// Leave this technically in place until expiration-mailer is fully deleted,
+	// but this test cannot function now that the SA never stores nor retrieves
+	// contacts.
+	t.Skip()
+
 	testCtx := setup(t, []time.Duration{time.Hour * 24})
 
 	addExpiringCerts(t, testCtx)
@@ -776,6 +786,11 @@ func TestCertIsRenewed(t *testing.T) {
 }
 
 func TestLifetimeOfACert(t *testing.T) {
+	// Leave this technically in place until expiration-mailer is fully deleted,
+	// but this test cannot function now that the SA never stores nor retrieves
+	// contacts.
+	t.Skip()
+
 	testCtx := setup(t, []time.Duration{time.Hour * 24, time.Hour * 24 * 4, time.Hour * 24 * 7})
 	defer testCtx.cleanUp()
 
@@ -882,6 +897,11 @@ func TestDontFindRevokedCert(t *testing.T) {
 }
 
 func TestDedupOnRegistration(t *testing.T) {
+	// Leave this technically in place until expiration-mailer is fully deleted,
+	// but this test cannot function now that the SA never stores nor retrieves
+	// contacts.
+	t.Skip()
+
 	expiresIn := 96 * time.Hour
 	testCtx := setup(t, []time.Duration{expiresIn})
 

test/integration/admin_test.go

@@ -1146,33 +1146,6 @@ def test_ocsp_exp_unauth():
     else:
         raise(Exception("timed out waiting for unauthorized OCSP response for expired certificate. Last error: {}".format(last_error)))
 
-def test_expiration_mailer():
-    # This test relies on contact addresses being persisted, which we no longer
-    # do in config-next.
-    if 'config-next' in os.environ['BOULDER_CONFIG_DIR']:
-        return
-
-    email_addr = "integration.%[email protected]" % random.randrange(2**16)
-    order = chisel2.auth_and_issue([random_domain()], email=email_addr)
-    cert = parse_cert(order)
-    # Check that the expiration mailer sends a reminder
-    expiry = cert.not_valid_after_utc
-    no_reminder = expiry + datetime.timedelta(days=-31)
-    first_reminder = expiry + datetime.timedelta(days=-13)
-    last_reminder = expiry + datetime.timedelta(days=-2)
-
-    requests.post("http://localhost:9381/clear", data='')
-    for time in (no_reminder, first_reminder, last_reminder):
-        print(get_future_output(
-            ["./bin/boulder", "expiration-mailer",
-             "--config", "%s/expiration-mailer.json" % config_dir,
-             "--debug-addr", ":8008"],
-            time))
-    resp = requests.get("http://localhost:9381/count?to=%s" % email_addr)
-    mailcount = int(resp.text)
-    if mailcount != 2:
-        raise(Exception("\nExpiry mailer failed: expected 2 emails, got %d" % mailcount))
-
 def test_caa_good():
     domain = random_domain()
     challSrv.add_caa_issue(domain, "happy-hacker-ca.invalid")