lib/minitest/queue.rb in ci-queue-0.32.0 vs lib/minitest/queue.rb in ci-queue-0.33.0
- old
+ new
@@ -232,11 +232,15 @@
if example.flaky?
result.mark_as_flaked!
failed = false
end
- if failed
+ if failed && queue.config.failing_test && queue.config.failing_test != example.id
+ # When we do a bisect, we don't care about the result other than the test we're running the bisect on
+ result.mark_as_flaked!
+ failed = false
+ elsif failed
queue.report_failure!
else
queue.report_success!
end
@@ -257,26 +261,26 @@
end
end
end
end
-MiniTest.singleton_class.prepend(MiniTest::Queue)
-if defined? MiniTest::Result
- MiniTest::Result.prepend(MiniTest::Requeueing)
- MiniTest::Result.prepend(MiniTest::Flakiness)
- MiniTest::Result.prepend(MiniTest::WithTimestamps)
+Minitest.singleton_class.prepend(Minitest::Queue)
+if defined? Minitest::Result
+ Minitest::Result.prepend(Minitest::Requeueing)
+ Minitest::Result.prepend(Minitest::Flakiness)
+ Minitest::Result.prepend(Minitest::WithTimestamps)
else
- MiniTest::Test.prepend(MiniTest::Requeueing)
- MiniTest::Test.prepend(MiniTest::Flakiness)
- MiniTest::Test.prepend(MiniTest::WithTimestamps)
+ Minitest::Test.prepend(Minitest::Requeueing)
+ Minitest::Test.prepend(Minitest::Flakiness)
+ Minitest::Test.prepend(Minitest::WithTimestamps)
module MinitestBackwardCompatibility
def source_location
method(name).source_location
end
def klass
self.class.name
end
end
- MiniTest::Test.prepend(MinitestBackwardCompatibility)
+ Minitest::Test.prepend(MinitestBackwardCompatibility)
end