diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-06 16:44:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-06 16:44:45 +0000 |
| commit | b573276e00f486120b35d84b892df2c0fa617acc (patch) | |
| tree | 29dbc6cb9140c7cc57b126af9193ccadce23d909 /nova/tests | |
| parent | 72c1dd677b2ea67820c07a12372904e0016742c9 (diff) | |
| parent | 2fde2294d8fcf536acf640f5840c4e551b9dd433 (diff) | |
Merge "Cleanup xenapi driver logging messages to include instance"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_xenapi.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index b15daa7e6..9539c5cbe 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -895,11 +895,11 @@ class XenAPIMigrateInstance(test.TestCase): db.migration_get_all_unconfirmed(fake_context, resize_confirm_window).AndReturn(migrations) # Found unconfirmed migrations message - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) # test success (ACTIVE/RESIZE_VERIFY) instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) conn._vmops.compute_api.confirm_resize(fake_context, @@ -908,7 +908,7 @@ class XenAPIMigrateInstance(test.TestCase): # test instance that doesn't exist anymore sets migration to # error instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndRaise(exception.InstanceNotFound) vmops.LOG.warn(mox.IgnoreArg()) @@ -916,32 +916,32 @@ class XenAPIMigrateInstance(test.TestCase): # test instance in ERROR/RESIZE_VERIFY sets migration to error instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) - vmops.LOG.warn(mox.IgnoreArg()) + vmops.LOG.warn(mox.IgnoreArg(), instance=instance) db.migration_update(fake_context, 3, {'status': 'error'}) # test instance in ACTIVE/REBOOTING sets migration to error instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) - vmops.LOG.warn(mox.IgnoreArg()) + vmops.LOG.warn(mox.IgnoreArg(), instance=instance) db.migration_update(fake_context, 4, {'status': 'error'}) # test confirm_resize raises and doesn't set migration to error instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) conn._vmops.compute_api.confirm_resize(fake_context, instance).AndRaise(test.TestingException) - vmops.LOG.error(mox.IgnoreArg()) + vmops.LOG.error(mox.IgnoreArg(), instance=instance) # test succeeds again (ACTIVE/RESIZE_VERIFY) instance = instances.pop(0) - vmops.LOG.info(mox.IgnoreArg()) + vmops.LOG.info(mox.IgnoreArg(), mox.IgnoreArg()) db.instance_get_by_uuid(fake_context, instance['uuid']).AndReturn(instance) conn._vmops.compute_api.confirm_resize(fake_context, |