Incorporate feedback

Author: dduugg

Library/Homebrew/test_bot/formulae_dependents.rb

@@ -21,9 +21,9 @@ class FormulaeDependents < TestFormulae
       }
       def initialize(tap:, git:, dry_run:, fail_fast:, verbose:)
         super
-        @testing_formulae_with_tested_dependents = T.let(nil, T.nilable(T::Array[String]))
+        @testing_formulae_with_tested_dependents = T.let([], T::Array[String])
         @tested_dependents_list = T.let(nil, T.nilable(Pathname))
-        @dependent_testing_formulae = T.let(nil, T.nilable(T::Array[String]))
+        @dependent_testing_formulae = T.let([], T::Array[String])
       end
 
       sig { params(args: Homebrew::Cmd::TestBotCmd::Args).void }
@@ -37,7 +37,7 @@ def run!(args:)
         info_header "Skipped or failed formulae:"
         puts skipped_or_failed_formulae
 
-        @testing_formulae_with_tested_dependents = T.let([], T.nilable(T::Array[String]))
+        @testing_formulae_with_tested_dependents = []
         @tested_dependents_list = Pathname("tested-dependents-#{Utils::Bottles.tag}.txt")
 
         @dependent_testing_formulae = sorted_formulae - skipped_or_failed_formulae
@@ -92,10 +92,10 @@ def install_formulae_if_needed_from_bottles!(installable_bottles, args:)
 
       sig { params(formula_name: String, args: Homebrew::Cmd::TestBotCmd::Args).void }
       def dependent_formulae!(formula_name, args:)
-        cleanup_during!(T.must(@dependent_testing_formulae), args:)
+        cleanup_during!(@dependent_testing_formulae, args:)
 
         test_header(:FormulaeDependents, method: "dependent_formulae!(#{formula_name})")
-        T.must(@testing_formulae_with_tested_dependents) << formula_name
+        @testing_formulae_with_tested_dependents << formula_name
 
         formula = Formulary.factory(formula_name)
 
@@ -208,7 +208,7 @@ def dependents_for_formula(formula, formula_name, args:)
         # Defer formulae which could be tested later
         # i.e. formulae that also depend on something else yet to be built in this test run.
         dependents.reject! do |_, deps|
-          still_to_test = T.must(@dependent_testing_formulae) - T.must(@testing_formulae_with_tested_dependents)
+          still_to_test = @dependent_testing_formulae - @testing_formulae_with_tested_dependents
           deps.map { |d| d.to_formula.full_name }.intersect?(still_to_test)
         end
 
@@ -223,7 +223,7 @@ def dependents_for_formula(formula, formula_name, args:)
           # rubocop:enable Homebrew/MoveToExtendOS
 
           all_deps_bottled_or_built = deps.all? do |d|
-            bottled_or_built?(d.to_formula, T.must(@dependent_testing_formulae))
+            bottled_or_built?(d.to_formula, @dependent_testing_formulae)
           end
           args.build_dependents_from_source? && all_deps_bottled_or_built
         end
@@ -282,7 +282,7 @@ def install_dependent(dependent, testable_dependents, args:, build_from_source:
           return
         end
 
-        cleanup_during!(T.must(@dependent_testing_formulae), args:)
+        cleanup_during!(@dependent_testing_formulae, args:)
 
         required_dependent_deps = dependent.deps.reject(&:optional?)
         bottled_on_current_version = bottled?(dependent, no_older_versions: true)

Library/Homebrew/test_bot/formulae_detect.rb

@@ -10,7 +10,7 @@ class FormulaeDetect < Test
       sig {
         params(
           argument:  String,
-          tap:       T.nilable(Tap),
+          tap:       Tap,
           git:       String,
           dry_run:   T::Boolean,
           fail_fast: T::Boolean,
@@ -25,6 +25,7 @@ def initialize(argument, tap:, git:, dry_run:, fail_fast:, verbose:)
         @deleted_formulae = T.let([], T::Array[String])
         @formulae_to_fetch = T.let([], T::Array[String])
         @testing_formulae = T.let([], T::Array[String])
+        @tap = T.let(tap, Tap)
       end
 
       sig { params(args: Homebrew::Cmd::TestBotCmd::Args).void }
@@ -83,10 +84,10 @@ def detect_formulae!(args:)
               No known CI provider detected! If you are using GitHub Actions then we cannot find the expected environment variables! Check you have e.g. exported them to a Docker container.
             EOS
           end
-        elsif tap.present? && T.must(tap).full_name.casecmp(github_repository)&.zero?
+        elsif @tap.full_name.casecmp(github_repository)&.zero?
           # Use GitHub Actions variables for pull request jobs.
           if (base_ref = ENV.fetch("GITHUB_BASE_REF", nil)).present?
-            unless T.must(tap).official?
+            unless @tap.official?
               test git.to_s, "-C", repository.to_s, "fetch",
                    "origin", "+refs/heads/#{base_ref}"
             end
@@ -100,7 +101,7 @@ def detect_formulae!(args:)
             diff_end_sha1 = github_sha
           # Use GitHub Actions variables for branch jobs.
           else
-            test git.to_s, "-C", repository.to_s, "fetch", "origin", "+#{github_ref}" unless T.must(tap).official?
+            test git.to_s, "-C", repository.to_s, "fetch", "origin", "+#{github_ref}" unless @tap.official?
             origin_ref = "origin/#{github_ref.gsub(%r{^refs/heads/}, "")}"
             diff_end_sha1 = diff_start_sha1 = github_sha
           end
@@ -120,15 +121,15 @@ def detect_formulae!(args:)
 
         if tap
           tap_origin_ref_revision_args =
-            [git, "-C", T.must(tap).path.to_s, "log", "-1", "--format=%h (%s)", origin_ref]
+            [git, "-C", @tap.path.to_s, "log", "-1", "--format=%h (%s)", origin_ref]
           tap_origin_ref_revision = if args.dry_run?
             # May fail on dry run as we've not fetched.
             Utils.popen_read(*tap_origin_ref_revision_args).strip
           else
             Utils.safe_popen_read(*tap_origin_ref_revision_args)
           end.strip
           tap_revision = Utils.safe_popen_read(
-            git, "-C", T.must(tap).path.to_s,
+            git, "-C", @tap.path.to_s,
             "log", "-1", "--format=%h (%s)"
           ).strip
         end
@@ -143,8 +144,8 @@ def detect_formulae!(args:)
 
         modified_formulae = []
 
-        if tap && diff_start_sha1 != diff_end_sha1
-          formula_path = T.must(tap).formula_dir.to_s
+        if diff_start_sha1 != diff_end_sha1
+          formula_path = @tap.formula_dir.to_s
           @added_formulae +=
             diff_formulae(diff_start_sha1, diff_end_sha1, formula_path, "A")
           modified_formulae +=
@@ -255,17 +256,15 @@ def current_sha1
         ).returns(T::Array[String])
       }
       def diff_formulae(start_revision, end_revision, path, filter)
-        raise "A tap is required to call diff_formulae" unless tap
-
         Utils.safe_popen_read(
           git, "-C", repository,
           "diff-tree", "-r", "--name-only", "--diff-filter=#{filter}",
           start_revision, end_revision, "--", path
         ).lines(chomp: true).filter_map do |file|
-          next unless T.must(tap).formula_file?(file)
+          next unless @tap.formula_file?(file)
 
           file = Pathname.new(file)
-          T.must(tap).formula_file_to_name(file)
+          @tap.formula_file_to_name(file)
         end
       end
     end

Library/Homebrew/test_bot/test_runner.rb

@@ -174,6 +174,8 @@ def build_tests(argument, tap:, git:, output_paths:, skip_setup:,
                               args.added_formulae.nil? &&
                               args.deleted_formulae.nil?
           if no_formulae_flags && (no_only_args || args.only_formulae? || args.only_formulae_detect?)
+            raise "A tap is required to build formulae" unless tap
+
             formulae_detect = FormulaeDetect.new(argument, tap:,
                                                            git:,
                                                            dry_run:   args.dry_run?,