Skip to content

Fix flaky SearchTest.test_compat_override test #10601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EnTeQuAk merged 2 commits into from
Feb 6, 2019
Merged

Fix flaky SearchTest.test_compat_override test #10601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02e32b7
Fix flaky SearchTest.test_compat_override test
diox Feb 5, 2019
43a3ee1
Fix tests
diox Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/olympia/amo/tests/test_amo_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,23 +201,24 @@ def setUp(self):
super(TestCacheNamespaces, self).setUp()
self.namespace = 'redis-is-dead'

@mock.patch('olympia.amo.utils.epoch')
@mock.patch('olympia.amo.utils.utc_millesecs_from_epoch')
def test_no_preexisting_key(self, epoch_mock):
epoch_mock.return_value = 123456
assert cache_ns_key(self.namespace) == '123456:ns:%s' % self.namespace
epoch_mock.return_value = 1549383758398
assert cache_ns_key(self.namespace) == (
'1549383758398:ns:%s' % self.namespace)

@mock.patch('olympia.amo.utils.epoch')
@mock.patch('olympia.amo.utils.utc_millesecs_from_epoch')
def test_no_preexisting_key_incr(self, epoch_mock):
epoch_mock.return_value = 123456
epoch_mock.return_value = 1549383758398
assert cache_ns_key(self.namespace, increment=True) == (
'123456:ns:%s' % self.namespace)
'1549383758398:ns:%s' % self.namespace)

@mock.patch('olympia.amo.utils.epoch')
@mock.patch('olympia.amo.utils.utc_millesecs_from_epoch')
def test_key_incr(self, epoch_mock):
epoch_mock.return_value = 123456
cache_ns_key(self.namespace) # Sets ns to 123456
ns_key = cache_ns_key(self.namespace, increment=True)
expected = '123457:ns:%s' % self.namespace
epoch_mock.return_value = 1549383758398
cache_ns_key(self.namespace) # Sets ns to 1549383758398
ns_key = cache_ns_key(self.namespace, increment=True) # Increments it.
expected = '1549383758399:ns:%s' % self.namespace
assert ns_key == expected
assert cache_ns_key(self.namespace) == expected

Expand Down
4 changes: 2 additions & 2 deletions src/olympia/amo/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,12 +761,12 @@ def cache_ns_key(namespace, increment=False):
ns_val = cache.incr(ns_key)
except ValueError:
log.info('Cache increment failed for key: %s. Resetting.' % ns_key)
ns_val = epoch(datetime.datetime.now())
ns_val = utc_millesecs_from_epoch(datetime.datetime.now())
cache.set(ns_key, ns_val, None)
else:
ns_val = cache.get(ns_key)
if ns_val is None:
ns_val = epoch(datetime.datetime.now())
ns_val = utc_millesecs_from_epoch(datetime.datetime.now())
cache.set(ns_key, ns_val, None)
return '%s:%s' % (ns_val, ns_key)

Expand Down