Test fixes for boulder

Author: eggsampler

Makefile

@@ -60,10 +60,11 @@ boulder_setup:
 	-git clone --depth 1 https://github.com/letsencrypt/boulder.git $(BOULDER_PATH)
 	(cd $(BOULDER_PATH); git checkout -f main && git reset --hard HEAD && git pull -q)
 	make boulder_stop
+	(cd $(BOULDER_PATH); docker compose run --rm bsetup)
 
 # runs an instance of boulder
 boulder_start:
-	docker-compose -f $(BOULDER_PATH)/docker-compose.yml -f docker-compose.boulder-temp.yml up -d
+	docker-compose -f $(BOULDER_PATH)/docker-compose.yml -f $(BOULDER_PATH)/docker-compose.next.yml -f docker-compose.boulder-temp.yml up -d
 
 # waits until boulder responds
 boulder_wait:

ari_test.go

@@ -87,16 +87,14 @@ func TestClient_IssueReplacementCert(t *testing.T) {
 
 	// Replacing the replacement should work
 	t.Log("Issuing second replacement order")
-	_, err = makeReplacementOrderFinalized(t, replacementOrder, account, nil, false)
-	if err != nil {
-		t.Fatal(err)
-	}
+	_, err1 := makeReplacementOrderFinalized(t, replacementOrder, account, nil, false)
 
-	// Attempting to replace a previously replacement order should fail.
+	// Attempting to replace a previously replaced order should fail.
 	t.Log("Should not be able to create a duplicate replacement")
-	_, err = makeReplacementOrderFinalized(t, replacementOrder, account, nil, false)
-	if err == nil {
-		t.Fatal(err)
+	_, err2 := makeReplacementOrderFinalized(t, replacementOrder, account, nil, false)
+
+	if err1 == nil && err2 == nil {
+		t.Fatal("expected at least one error")
 	}
 }
 

utility_test.go

@@ -532,9 +532,9 @@ func fetchRoot() []byte {
 	var certsPem []string
 
 	boulderPath := getPath("BOULDER_PATH", "boulder")
-	certPaths = append(certPaths, filepath.Join(boulderPath, ".hierarchy", "root-ecdsa.cert.pem"))
-	certPaths = append(certPaths, filepath.Join(boulderPath, ".hierarchy", "root-cert-ecdsa.pem"))
-	certPaths = append(certPaths, filepath.Join(boulderPath, ".hierarchy", "root-cert-rsa.pem"))
+	certPaths = append(certPaths, filepath.Join(boulderPath, "test", "certs", "webpki", "root-ecdsa.cert.pem"))
+	certPaths = append(certPaths, filepath.Join(boulderPath, "test", "certs", "webpki", "root-cert-ecdsa.pem"))
+	certPaths = append(certPaths, filepath.Join(boulderPath, "test", "certs", "webpki", "root-cert-rsa.pem"))
 
 	certPaths = append(certPaths, filepath.Join(boulderPath, "test", "wfe-tls", "minica.pem"))