summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2025-03-24 10:46:05 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2025-03-24 13:25:07 +0900
commitef7c7f9e77777477b8f6cdd72f92f9650afafdb4 (patch)
treeda835f37c9580d70e07216896b0eac9b74870a7f
parent55930987e10b84a39562cdbd483f9d85074d26fe (diff)
Revert "Fix broken CI. (#12963)"
This reverts commit eb91c664dc0b4d69db09ae913f2d7a5ef3490d74.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/12968
-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 981abe11b3..a54316dbca 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 + 30
+ deadline = now + 10
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 b05ad9f7db..c763da4c00 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 match(/deadbeef (not found in upstream origin|does not exist in the repository)/)
+ expect(err).to include("Revision deadbeef does not exist in the repository")
end
end