Merge pull request #9181 from reitermarkus/local-tests

Fix tests failing locally.

.github/workflows/tests.yml

@@ -6,7 +6,7 @@ on:
 env:
   HOMEBREW_DEVELOPER: 1
   HOMEBREW_NO_AUTO_UPDATE: 1
-  HOMEBREW_GITHUB_ACTIONS_BIG_SUR_TESTING: 1 # TODO: remove when Big Sur is released.
+  HOMEBREW_BIG_SUR_TESTING: 1 # TODO: remove when Big Sur is released.
 jobs:
   tests:
     if: github.repository == 'Homebrew/brew'

Library/Homebrew/dev-cmd/tests.rb

@@ -63,6 +63,7 @@ module Homebrew
       ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic?
       ENV["HOMEBREW_TEST_ONLINE"] = "1" if args.online?
       ENV["HOMEBREW_SORBET_RUNTIME"] = "1"
+      ENV["HOMEBREW_BIG_SUR_TESTING"] = "1"
 
       ENV["USER"] ||= system_command!("id", args: ["-nu"]).stdout.chomp
 

Library/Homebrew/extend/os/mac/diagnostic.rb

@@ -109,7 +109,7 @@ module Homebrew
         who = +"We"
         # TODO: remove when Big Sur is supported.
         what = if MacOS.version == :big_sur
-          return if ENV["HOMEBREW_GITHUB_ACTIONS_BIG_SUR_TESTING"]
+          return if ENV["HOMEBREW_BIG_SUR_TESTING"]
 
           "released but not yet supported version"
         elsif OS::Mac.prerelease?

Library/Homebrew/test/utils/github_spec.rb

@@ -54,7 +54,7 @@ describe GitHub do
     it "errors on an unauthenticated token" do
       expect {
         subject.sponsors_by_tier("Homebrew")
-      }.to raise_error(/INSUFFICIENT_SCOPES|FORBIDDEN/)
+      }.to raise_error(/INSUFFICIENT_SCOPES|FORBIDDEN|token needs the 'admin:org' scope/)
     end
   end