Skip to content

Commit 3b01e92

Browse files
authored
Merge pull request rails#43670 from esparta/fix_race_conditions_test_cache
ActiveSupport: Fix some race conditions on test/cache/stores
2 parents 3276286 + 71d8483 commit 3b01e92

File tree

2 files changed

+232
-159
lines changed

2 files changed

+232
-159
lines changed

activesupport/test/cache/behaviors/cache_increment_decrement_behavior.rb

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,28 @@
22

33
module CacheIncrementDecrementBehavior
44
def test_increment
5-
@cache.write("foo", 1, raw: true)
6-
assert_equal 1, @cache.read("foo", raw: true).to_i
7-
assert_equal 2, @cache.increment("foo")
8-
assert_equal 2, @cache.read("foo", raw: true).to_i
9-
assert_equal 3, @cache.increment("foo")
10-
assert_equal 3, @cache.read("foo", raw: true).to_i
5+
key = SecureRandom.uuid
6+
@cache.write(key, 1, raw: true)
7+
assert_equal 1, @cache.read(key, raw: true).to_i
8+
assert_equal 2, @cache.increment(key)
9+
assert_equal 2, @cache.read(key, raw: true).to_i
10+
assert_equal 3, @cache.increment(key)
11+
assert_equal 3, @cache.read(key, raw: true).to_i
1112

12-
missing = @cache.increment("bar")
13+
missing = @cache.increment(SecureRandom.alphanumeric)
1314
assert(missing.nil? || missing == 1)
1415
end
1516

1617
def test_decrement
17-
@cache.write("foo", 3, raw: true)
18-
assert_equal 3, @cache.read("foo", raw: true).to_i
19-
assert_equal 2, @cache.decrement("foo")
20-
assert_equal 2, @cache.read("foo", raw: true).to_i
21-
assert_equal 1, @cache.decrement("foo")
22-
assert_equal 1, @cache.read("foo", raw: true).to_i
18+
key = SecureRandom.uuid
19+
@cache.write(key, 3, raw: true)
20+
assert_equal 3, @cache.read(key, raw: true).to_i
21+
assert_equal 2, @cache.decrement(key)
22+
assert_equal 2, @cache.read(key, raw: true).to_i
23+
assert_equal 1, @cache.decrement(key)
24+
assert_equal 1, @cache.read(key, raw: true).to_i
2325

24-
missing = @cache.decrement("bar")
26+
missing = @cache.decrement(SecureRandom.alphanumeric)
2527
assert(missing.nil? || missing == -1)
2628
end
2729
end

0 commit comments

Comments
 (0)