Fix attestation test failures

Homebrew · Oct 4, 2024 · 7b74bf0 · 7b74bf0
1 parent 6b63660
commit 7b74bf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Library/Homebrew/attestation.rb b/Library/Homebrew/attestation.rb
@@ -254,7 +254,7 @@ def self.check_core_attestation(bottle)
 
       sleep_time = 3 ** @attestation_retry_count[bottle]
       opoo "Failed to verify attestation. Retrying in #{sleep_time}..."
-      sleep sleep_time
+      sleep sleep_time if ENV["HOMEBREW_TESTS"].blank?
       @attestation_retry_count[bottle] += 1
       retry
     end

diff --git a/Library/Homebrew/test/attestation_spec.rb b/Library/Homebrew/test/attestation_spec.rb
@@ -259,14 +259,15 @@
                               described_class::HOMEBREW_CORE_REPO, "--format", "json"],
               env: { "GH_TOKEN" => fake_gh_creds, "GH_HOST" => "github.com" }, secrets: [fake_gh_creds],
               print_stderr: false, chdir: HOMEBREW_TEMP)
-        .once
+        .exactly(described_class::ATTESTATION_MAX_RETRIES + 1)
         .and_raise(described_class::MissingAttestationError)
 
       expect(described_class).to receive(:system_command!)
         .with(fake_gh, args: ["attestation", "verify", cached_download, "--repo",
                               described_class::BACKFILL_REPO, "--format", "json"],
               env: { "GH_TOKEN" => fake_gh_creds, "GH_HOST" => "github.com" }, secrets: [fake_gh_creds],
               print_stderr: false, chdir: HOMEBREW_TEMP)
+        .exactly(described_class::ATTESTATION_MAX_RETRIES + 1)
         .and_return(fake_result_json_resp_too_new)
 
       expect do