particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implement caching in _fix_cb_args

Browse source
This commit is contained in:
Mike McLean 2017-08-03 13:53:07 -04:00
parent fe7c0b4052
commit 0c8d4c8f07
2 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
koji/plugin.py
View file

@ -200,6 +200,16 @@ def run_callbacks(cbtype, *args, **kws):
def _fix_cb_args(func, args, kwargs, cache):
if getattr(func, 'convert_datetime', False):
args = encode_datetime_recurse(args)
kwargs = encode_datetime_recurse(kwargs)
if id(args) in cache:
args = cache[id(args)]
else:
val = encode_datetime_recurse(args)
cache[id(args)] = val
args = val
if id(kwargs) in cache:
kwargs = cache[id(kwargs)]
else:
val = encode_datetime_recurse(kwargs)
cache[id(kwargs)] = val
kwargs = val
return args, kwargs

32
tests/test_lib/test_plugin.py
View file

@ -104,6 +104,10 @@ class TestCallbacks(unittest.TestCase):
def datetime_callback(self, cbtype, *args, **kwargs):
self.callbacks.append([cbtype, args, kwargs])
@koji.plugin.convert_datetime
def datetime_callback2(self, cbtype, *args, **kwargs):
self.callbacks.append([cbtype, args, kwargs])
def test_simple_callback(self):
args = ('hello',)
kwargs = {'world': 1}
@ -146,6 +150,34 @@ class TestCallbacks(unittest.TestCase):
self.assertEqual(len(self.callbacks), 1)
self.assertEqual(self.callbacks[0], [cbtype, args2, kwargs2])
def test_multiple_datetime_callback(self):
dt1 = datetime.datetime.now()
dt2 = datetime.datetime(2001,1,1)
args = (dt1,"2",["three"], {4: dt2},)
kwargs = {'foo': [dt1, dt2]}
cbtype = 'preTag'
koji.plugin.register_callback(cbtype, self.datetime_callback)
koji.plugin.register_callback(cbtype, self.datetime_callback2)
koji.plugin.run_callbacks(cbtype, *args, **kwargs)
args2 = koji.util.encode_datetime_recurse(args)
kwargs2 = koji.util.encode_datetime_recurse(kwargs)
self.assertEqual(len(self.callbacks), 2)
self.assertEqual(self.callbacks[0], [cbtype, args2, kwargs2])
self.assertEqual(self.callbacks[1], [cbtype, args2, kwargs2])
# verify that caching worked
# unfortunately, args and kwargs get unpacked and repacked, so we have
# to dig down
cb_args1 = self.callbacks[0][1]
cb_args2 = self.callbacks[1][1]
for i in range(len(cb_args1)):
if cb_args1[i] is not cb_args2[i]:
raise Exception("converted args not cached")
cb_kwargs1 = self.callbacks[0][2]
cb_kwargs2 = self.callbacks[1][2]
for k in cb_kwargs1:
if cb_kwargs1[k] is not cb_kwargs2[k]:
raise Exception("converted kwargs not cached")
def test_bad_callback(self):
args = ('hello',)
kwargs = {'world': 1}