|
@@ -106,7 +106,7 @@ class test_Persistent:
|
|
|
|
|
|
def add_revoked(self, p, *ids):
|
|
|
for id in ids:
|
|
|
- p.db.setdefault('revoked', LimitedSet()).add(id)
|
|
|
+ p.db.setdefault(b'revoked', LimitedSet()).add(id)
|
|
|
|
|
|
def test_merge(self, p, data=['foo', 'bar', 'baz']):
|
|
|
state.revoked.update(data)
|
|
@@ -117,26 +117,26 @@ class test_Persistent:
|
|
|
def test_merge_dict(self, p):
|
|
|
p.clock = Mock()
|
|
|
p.clock.adjust.return_value = 626
|
|
|
- d = {'revoked': {'abc': time()}, 'clock': 313}
|
|
|
+ d = {b'revoked': {b'abc': time()}, b'clock': 313}
|
|
|
p._merge_with(d)
|
|
|
p.clock.adjust.assert_called_with(313)
|
|
|
- assert d['clock'] == 626
|
|
|
+ assert d[b'clock'] == 626
|
|
|
assert 'abc' in state.revoked
|
|
|
|
|
|
def test_sync_clock_and_purge(self, p):
|
|
|
passthrough = Mock()
|
|
|
passthrough.side_effect = lambda x: x
|
|
|
with patch('celery.worker.state.revoked') as revoked:
|
|
|
- d = {'clock': 0}
|
|
|
+ d = {b'clock': 0}
|
|
|
p.clock = Mock()
|
|
|
p.clock.forward.return_value = 627
|
|
|
p._dumps = passthrough
|
|
|
p.compress = passthrough
|
|
|
p._sync_with(d)
|
|
|
revoked.purge.assert_called_with()
|
|
|
- assert d['clock'] == 627
|
|
|
- assert 'revoked' not in d
|
|
|
- assert d['zrevoked'] is revoked
|
|
|
+ assert d[b'clock'] == 627
|
|
|
+ assert b'revoked' not in d
|
|
|
+ assert d[b'zrevoked'] is revoked
|
|
|
|
|
|
def test_sync(self, p,
|
|
|
data1=['foo', 'bar', 'baz'], data2=['baz', 'ini', 'koz']):
|
|
@@ -145,8 +145,8 @@ class test_Persistent:
|
|
|
state.revoked.add(item)
|
|
|
p.sync()
|
|
|
|
|
|
- assert p.db['zrevoked']
|
|
|
- pickled = p.decompress(p.db['zrevoked'])
|
|
|
+ assert p.db[b'zrevoked']
|
|
|
+ pickled = p.decompress(p.db[b'zrevoked'])
|
|
|
assert pickled
|
|
|
saved = pickle.loads(pickled)
|
|
|
for item in data2:
|