diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-11 19:04:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-11 19:04:51 +0000 |
| commit | 8f7dc3d8700a37956abf567d170ad42863baa4d7 (patch) | |
| tree | 3f627dc82977cb180e9ec338e94719c23d43c651 /nova/tests/unit/fake_instance.py | |
| parent | 3c76d999da1efb83ad4c003ec118a117c2cbb2f2 (diff) | |
| parent | 6a7a78a44ea19497ea3e331ddd672f95cd49c50e (diff) | |
| download | nova-8f7dc3d8700a37956abf567d170ad42863baa4d7.tar.gz | |
Merge "objects: Update keypairs when saving an instance" into stable/queens
Diffstat (limited to 'nova/tests/unit/fake_instance.py')
| -rw-r--r-- | nova/tests/unit/fake_instance.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/tests/unit/fake_instance.py b/nova/tests/unit/fake_instance.py index 934fdd2441..680b5148b0 100644 --- a/nova/tests/unit/fake_instance.py +++ b/nova/tests/unit/fake_instance.py @@ -117,7 +117,6 @@ def fake_instance_obj(context, obj_instance_class=None, **updates): is_public=True, extra_specs={}, projects=[]) - flavor.obj_reset_changes() inst = obj_instance_class._from_db_object(context, obj_instance_class(), fake_db_instance(**updates), expected_attrs=expected_attrs) @@ -133,7 +132,7 @@ def fake_instance_obj(context, obj_instance_class=None, **updates): inst.memory_mb = flavor.memory_mb inst.old_flavor = None inst.new_flavor = None - inst.obj_reset_changes() + inst.obj_reset_changes(recursive=True) return inst |