Merge pull request #9580 from ruby/scrub-invalid-utf8-command-output

Fixed flaky tests

(cherry picked from commit dce4b75)

Author: hsbt

bundler/lib/bundler/source/git/git_proxy.rb

@@ -432,9 +432,14 @@ def capture(cmd, dir, ignore_err: false)
         end
 
         def capture3_args_for(cmd, dir)
-          return ["git", *cmd] unless dir
+          # Disable automatic maintenance so a background commit-graph write in
+          # the source repo can't race the hardlinking local clone and fail with
+          # "hardlink different from source".
+          opts = ["-c", "gc.auto=0", "-c", "maintenance.auto=false"]
 
-          ["git", "-C", dir.to_s, *cmd]
+          return ["git", *opts, *cmd] unless dir
+
+          ["git", "-C", dir.to_s, *opts, *cmd]
         end
 
         def extra_clone_args

bundler/spec/support/command_execution.rb

@@ -72,7 +72,7 @@ def failure?
     attr_reader :failure_reason
 
     def normalize(string)
-      string.force_encoding(Encoding::UTF_8).strip.gsub("\r\n", "\n")
+      string.dup.force_encoding(Encoding::UTF_8).scrub.strip.gsub("\r\n", "\n")
     end
   end
 end

test/rubygems/test_gem_commands_owner_command.rb

@@ -399,7 +399,6 @@ def test_with_webauthn_enabled_success
   end
 
   def test_with_webauthn_enabled_failure
-    pend "Flaky on TruffleRuby" if RUBY_ENGINE == "truffleruby"
     response_success = "Owner added successfully."
     server = Gem::MockTCPServer.new
     error = Gem::WebauthnVerificationError.new("Something went wrong")
@@ -417,7 +416,8 @@ def test_with_webauthn_enabled_failure
       end
     end
 
-    assert_match @stub_fetcher.last_request["Authorization"], Gem.configuration.rubygems_api_key
+    webauthn_verification_request = @stub_fetcher.requests.find {|req| req.path == "/api/v1/webauthn_verification" }
+    assert_match webauthn_verification_request["Authorization"], Gem.configuration.rubygems_api_key
     assert_match "You have enabled multi-factor authentication. Please visit the following URL " \
       "to authenticate via security device. If you can't verify using WebAuthn but have OTP enabled, " \
       "you can re-run the gem signin command with the `--otp [your_code]` option.", @stub_ui.output