diff options
| -rw-r--r-- | bootstraptest/test_fork.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/install/gemfile/git_spec.rb | 2 |
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 |