diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | activesupport/test/file_evented_update_checker_test.rb | 5 | ||||
| -rwxr-xr-x | ci/travis.rb | 10 |
4 files changed, 5 insertions, 16 deletions
@@ -45,7 +45,7 @@ end # Active Support. gem 'dalli', '>= 2.2.1' -gem 'listen', '~> 3.0.4' +gem 'listen', '~> 3.0.5' # Active Job. group :job do diff --git a/Gemfile.lock b/Gemfile.lock index 883a7d8eff..31a3343a7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -222,7 +222,7 @@ GEM kindlerb (0.1.1) mustache nokogiri - listen (3.0.4) + listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) loofah (2.0.3) @@ -342,7 +342,7 @@ DEPENDENCIES jquery-rails! json kindlerb (= 0.1.1) - listen (~> 3.0.4) + listen (~> 3.0.5) mail! minitest (< 5.3.4) mocha (~> 0.14) diff --git a/activesupport/test/file_evented_update_checker_test.rb b/activesupport/test/file_evented_update_checker_test.rb index ec3a7e28f3..071449d399 100644 --- a/activesupport/test/file_evented_update_checker_test.rb +++ b/activesupport/test/file_evented_update_checker_test.rb @@ -5,11 +5,6 @@ require 'file_update_checker_shared_tests' class FileEventedUpdateCheckerTest < ActiveSupport::TestCase include FileUpdateCheckerSharedTests - def setup - skip if ENV['LISTEN'] == '0' - super - end - def new_checker(files = [], dirs = {}, &block) ActiveSupport::FileEventedUpdateChecker.new(files, dirs, &block).tap do wait diff --git a/ci/travis.rb b/ci/travis.rb index 658d66c6b4..b29e06dd5c 100755 --- a/ci/travis.rb +++ b/ci/travis.rb @@ -111,14 +111,8 @@ class Build end def env - if activesupport? && !isolated? - # There is a known issue with the listen tests that casuses files to be - # incorrectly GC'ed even when they are still in-use. The current is to - # only run them in isolation to avoid randomly failing our test suite. - { 'LISTEN' => '0' } - else - {} - end + # Provide extra ENV variables for the build here + {} end def run_bug_report_templates |