diff options
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rw-r--r-- | activesupport/test/caching_test.rb | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 4c45265db0..c9755ae68e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,16 @@ rvm: - rbx-2 - jruby env: - - "GEM=railties" - - "GEM=ap" - - "GEM=am,amo,as,av,aj" - - "GEM=ar:mysql" - - "GEM=ar:mysql2" - - "GEM=ar:sqlite3" - - "GEM=ar:postgresql" + global: + - JRUBY_OPTS='-J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Djruby.compile.mode=OFF -J-Djruby.compile.invokedynamic=false -J-Xmx1024M' + matrix: + - "GEM=railties" + - "GEM=ap" + - "GEM=am,amo,as,av,aj" + - "GEM=ar:mysql" + - "GEM=ar:mysql2" + - "GEM=ar:sqlite3" + - "GEM=ar:postgresql" matrix: allow_failures: - rvm: 1.9.3 diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb index 8287e62f4c..5945605f7b 100644 --- a/activesupport/test/caching_test.rb +++ b/activesupport/test/caching_test.rb @@ -939,8 +939,8 @@ class MemCacheStoreTest < ActiveSupport::TestCase def test_read_should_return_a_different_object_id_each_time_it_is_called @cache.write('foo', 'bar') - assert_not_equal @cache.read('foo').object_id, @cache.read('foo').object_id value = @cache.read('foo') + assert_not_equal value.object_id, @cache.read('foo').object_id value << 'bingo' assert_not_equal value, @cache.read('foo') end |