+ Removed minor optimization removing empty suites before run.

+ Simplified test randomization (test order will change even with fixed seed). [git-p4: depot-paths = "//src/minitest/dev/": change = 13422]
murugaperumal-ramasamy · Jun 5, 2022 · 9cdb2c6 · 9cdb2c6
1 parent ed224bc
commit 9cdb2c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/lib/minitest.rb b/lib/minitest.rb
@@ -158,7 +158,7 @@ def self.run args = []
  # sub-classes to run.
 
  def self.__run reporter, options
- suites = Runnable.runnables.reject { |s| s.runnable_methods.empty? }.shuffle
+ suites = Runnable.runnables.shuffle
  parallel, serial = suites.partition { |s| s.test_order == :parallel }
 
  # If we run the parallel tests before the serial tests, the parallel tests

diff --git a/lib/minitest/test.rb b/lib/minitest/test.rb
@@ -67,8 +67,7 @@ def self.runnable_methods
 
  case self.test_order
  when :random, :parallel then
- max = methods.size
- methods.sort.sort_by { rand max }
+ methods.sort.shuffle
  when :alpha, :sorted then
  methods.sort
  else

diff --git a/test/minitest/test_minitest_test.rb b/test/minitest/test_minitest_test.rb
@@ -99,20 +99,20 @@ def test_this_is_non_ascii_failure_message
  end
 
  expected = clean <<-EOM
- EF
+ FE
 
  Finished in 0.00
 
- 1) Error:
- FakeNamedTestXX#test_this_is_non_ascii_failure_message:
- RuntimeError: ЁЁЁ
- FILE:LINE:in `test_this_is_non_ascii_failure_message'
-
- 2) Failure:
+ 1) Failure:
  FakeNamedTestXX#test_this_is_not_ascii_assertion [FILE:LINE]:
  Expected: \"ЁЁЁ\"
  Actual: \"ёёё\"
 
+ 2) Error:
+ FakeNamedTestXX#test_this_is_non_ascii_failure_message:
+ RuntimeError: ЁЁЁ
+ FILE:LINE:in `test_this_is_non_ascii_failure_message'
+
  2 runs, 1 assertions, 1 failures, 1 errors, 0 skips
  EOM
 
@@ -260,7 +260,7 @@ def test_error
  end
 
  expected = clean <<-EOM
- E.
+ .E
 
  Finished in 0.00
 
@@ -307,7 +307,7 @@ def test_run_failing
  setup_basic_tu
 
  expected = clean <<-EOM
- F.
+ .F
 
  Finished in 0.00
 
@@ -491,7 +491,7 @@ def test_skip
  end
 
  expected = clean <<-EOM
- S.
+ .S
 
  Finished in 0.00
 
@@ -518,8 +518,8 @@ def test_skip
  end
 
  expected = clean <<-EOM
- FakeNamedTestXX#test_skip = 0.00 s = S
  FakeNamedTestXX#test_something = 0.00 s = .
+ FakeNamedTestXX#test_skip = 0.00 s = S
 
  Finished in 0.00