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"
This commit is contained in:
parent
c49051eaa8
commit
eb91c664dc
Notes:
git
2025-03-22 23:49:35 +00:00
Merged-By: ioquatix <samuel@codeotaku.com>
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user