Skip to content

Commit 48b6c60

Browse files
authored
[Misc #20661] Stop retrying tests in make test-all command by default (ruby#11271)
[Misc #20661] Stop retrying tests in make test-all command by default
1 parent 8bc7443 commit 48b6c60

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

tool/lib/test/unit.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ def setup_options(opts, options)
298298

299299
opts.separator "parallel test options:"
300300

301-
options[:retry] = true
301+
options[:retry] = false
302302

303303
opts.on '-j N', '--jobs N', /\A(t)?(\d+)\z/, "Allow run tests with N jobs at once" do |_, t, a|
304304
options[:testing] = true & t # For testing

tool/test/testunit/test_parallel.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def test_should_run_all_without_any_leaks
179179
end
180180

181181
def test_should_retry_failed_on_workers
182-
spawn_runner
182+
spawn_runner "--retry"
183183
buf = Timeout.timeout(TIMEOUT) {@test_out.read}
184184
assert_match(/^Retrying\.+$/,buf)
185185
end
@@ -206,14 +206,14 @@ def test_separate
206206
end
207207

208208
def test_hungup
209-
spawn_runner "--worker-timeout=1", "test4test_hungup.rb"
209+
spawn_runner "--worker-timeout=1", "--retry", "test4test_hungup.rb"
210210
buf = Timeout.timeout(TIMEOUT) {@test_out.read}
211211
assert_match(/^Retrying hung up testcases\.+$/, buf)
212212
assert_match(/^2 tests,.* 0 failures,/, buf)
213213
end
214214

215215
def test_retry_workers
216-
spawn_runner "--worker-timeout=1", "test4test_slow_0.rb", "test4test_slow_1.rb", jobs: "2"
216+
spawn_runner "--worker-timeout=1", "--retry", "test4test_slow_0.rb", "test4test_slow_1.rb", jobs: "2"
217217
buf = Timeout.timeout(TIMEOUT) {@test_out.read}
218218
assert_match(/^Retrying hung up testcases\.+$/, buf)
219219
assert_match(/^2 tests,.* 0 failures,/, buf)

0 commit comments

Comments
 (0)