Advertisement
Guest User

Untitled

a guest
Apr 7th, 2016
115
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.09 KB | None | 0 0
  1. diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py
  2. index 58ef19e..f72e4e6 100644
  3. --- a/nova/tests/fixtures.py
  4. +++ b/nova/tests/fixtures.py
  5. @@ -584,14 +584,19 @@ class StableObjectJsonFixture(fixtures.Fixture):
  6. def setUp(self):
  7. super(StableObjectJsonFixture, self).setUp()
  8.  
  9. - def _doit(obj, *args, **kwargs):
  10. + def _obj_to_prim_sorter(obj, *args, **kwargs):
  11. result = self._original_otp(obj, *args, **kwargs)
  12. if 'nova_object.changes' in result:
  13. result['nova_object.changes'].sort()
  14. return result
  15.  
  16. + # NOTE(alaski): This makes _obj_to_prim_sorter into an instancemethod
  17. + # so that its signature matches the method it's patching
  18. + obj_base.NovaObject._obj_to_prim_sorter = _obj_to_prim_sorter
  19. +
  20. self.useFixture(fixtures.MonkeyPatch(
  21. - 'nova.objects.base.NovaObject.obj_to_primitive', _doit))
  22. + 'nova.objects.base.NovaObject.obj_to_primitive',
  23. + obj_base.NovaObject._obj_to_prim_sorter))
  24.  
  25.  
  26. class EngineFacadeFixture(fixtures.Fixture):
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement