diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-10-11 13:33:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 13:33:37 -0400 |
| commit | 92a796bf6d9eead4c56f666617754072694b1d0a (patch) | |
| tree | 474b64cec73c4188da6fe3b9349b284ed420da12 | |
| parent | 81bbcea6cd0c0095614c2c4af3a01d692dcc7a64 (diff) | |
| parent | d888bec6dacd6445e3afee8737aaaf5e73256992 (diff) | |
| download | rails-92a796bf6d9eead4c56f666617754072694b1d0a.tar.gz rails-92a796bf6d9eead4c56f666617754072694b1d0a.tar.bz2 rails-92a796bf6d9eead4c56f666617754072694b1d0a.zip | |
Merge pull request #34185 from gmcgibbon/test_retry
Add test retries for railties
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index a4f5fa045d..f703ed0f90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ addons: - postgresql-10 - postgresql-client-10 -bundler_args: --without test --jobs 3 --retry 3 +bundler_args: --jobs 3 --retry 3 before_install: - "rm ${BUNDLE_GEMFILE}.lock" - "travis_retry gem update --system" @@ -99,6 +99,7 @@ instance_eval File.read local_gemfile if File.exist? local_gemfile group :test do gem "minitest-bisect" + gem "minitest-retry" platforms :mri do gem "stackprof" diff --git a/Gemfile.lock b/Gemfile.lock index b4f46698bc..927b36e9fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -323,6 +323,8 @@ GEM minitest-bisect (1.4.0) minitest-server (~> 1.0) path_expander (~> 1.0) + minitest-retry (0.1.9) + minitest (>= 5.0) minitest-server (1.0.5) minitest (~> 5.0) mono_logger (1.1.0) @@ -538,6 +540,7 @@ DEPENDENCIES libxml-ruby listen (>= 3.0.5, < 3.2) minitest-bisect + minitest-retry mysql2 (>= 0.4.10) nokogiri (>= 1.8.1) pg (>= 0.18.0) @@ -576,4 +579,4 @@ DEPENDENCIES websocket-client-simple! BUNDLED WITH - 1.16.5 + 1.16.6 diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index e44f21380e..d4eed69a87 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -16,6 +16,9 @@ require "active_support/testing/autorun" require "active_support/testing/stream" require "active_support/testing/method_call_assertions" require "active_support/test_case" +require "minitest/retry" + +Minitest::Retry.use!(verbose: false, retry_count: 1) RAILS_FRAMEWORK_ROOT = File.expand_path("../../..", __dir__) |