diff options
author | Sean Dague <sean.dague@samsung.com> | 2014-01-27 16:35:11 -0500 |
---|---|---|
committer | Sean Dague <sean.dague@samsung.com> | 2014-01-27 16:35:11 -0500 |
commit | 3992cfa3463fa7ab72a746cae38f7e212ad1a00a (patch) | |
tree | 858d9c4c11ca861823492c7c56ba25d492fcaefa /nova/tests/test_hooks.py | |
parent | 780ea4dead6f31e11b5ec11bde01260fb5d45e70 (diff) | |
download | nova-3992cfa3463fa7ab72a746cae38f7e212ad1a00a.tar.gz |
support stevedore >= 0.14
the previous mocks made some very specific assumptions about the
behavior of an internal private method in stevedore, which changed
in 0.14. Make the mocks more flexible so they work regardless.
Change-Id: I5063c652c705fd512f90ff3897a4c590f7ba7c02
Diffstat (limited to 'nova/tests/test_hooks.py')
-rw-r--r-- | nova/tests/test_hooks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/test_hooks.py b/nova/tests/test_hooks.py index dd4ab4241e..f2a1fb3bb8 100644 --- a/nova/tests/test_hooks.py +++ b/nova/tests/test_hooks.py @@ -63,7 +63,7 @@ class MockEntryPoint(object): class HookTestCase(test.NoDBTestCase): - def _mock_load_plugins(self, iload, iargs, ikwargs): + def _mock_load_plugins(self, iload, *iargs, **ikwargs): return [ stevedore.extension.Extension('test_hook', MockEntryPoint(SampleHookA), SampleHookA, SampleHookA()), @@ -98,7 +98,7 @@ class HookTestCase(test.NoDBTestCase): class HookTestCaseWithFunction(HookTestCase): - def _mock_load_plugins(self, iload, iargs, ikwargs): + def _mock_load_plugins(self, iload, *iargs, **ikwargs): return [ stevedore.extension.Extension('function_hook', MockEntryPoint(SampleHookC), SampleHookC, SampleHookC()), |