summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Williams <samuel.williams@oriontransfer.co.nz>2025-03-23 12:49:18 +1300
committerGitHub <noreply@github.com>2025-03-23 12:49:18 +1300
commiteb91c664dc0b4d69db09ae913f2d7a5ef3490d74 (patch)
tree4d808b46bd73e54ae72018d0af8c2a7e20f3299b
parentc49051eaa82e68b1a8792ad79f8cf2cf73f5ee90 (diff)
Fix broken CI. (#12963)
* Increase timeout to fix flaky tests? * Fix bundler test - wording changed. expect "fatal: Remote branch deadbeef not found in upstream origin" to include "Revision deadbeef does not exist in the repository"
Notes
Notes: Merged-By: ioquatix <samuel@codeotaku.com>
-rw-r--r--bootstraptest/test_fork.rb2
-rw-r--r--spec/bundler/install/gemfile/git_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
index a54316dbca..981abe11b3 100644
--- a/bootstraptest/test_fork.rb
+++ b/bootstraptest/test_fork.rb
@@ -84,7 +84,7 @@ assert_equal 'ok', %q{
10.times do
pid = fork{ exit!(0) }
- deadline = now + 10
+ deadline = now + 30
until Process.waitpid(pid, Process::WNOHANG)
if now > deadline
Process.kill(:KILL, pid)
diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb
index c763da4c00..b05ad9f7db 100644
--- a/spec/bundler/install/gemfile/git_spec.rb
+++ b/spec/bundler/install/gemfile/git_spec.rb
@@ -1204,7 +1204,7 @@ RSpec.describe "bundle install with git sources" do
gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "deadbeef"
G
- expect(err).to include("Revision deadbeef does not exist in the repository")
+ expect(err).to match(/deadbeef (not found in upstream origin|does not exist in the repository)/)
end
end