From 060c58ea65cfc5224e6e93059dda682e5e7ce806 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Mon, 25 Jun 2012 23:42:10 +0000 Subject: Fix hacking.py failures... test_xenapi hacking fix and volume_utils unneeded import Change-Id: I503cf0780850aba90d7ba8665d83bff08fb2504a --- nova/tests/test_xenapi.py | 2 +- nova/virt/xenapi/volume_utils.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index b9f73fcb4..bdef5c6d4 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -34,6 +34,7 @@ from nova import log as logging from nova.openstack.common import importutils from nova.openstack.common import timeutils from nova import test +import nova.tests.api.openstack.fakes as api_fakes from nova.tests.db import fakes as db_fakes from nova.tests import fake_network from nova.tests import fake_utils @@ -43,7 +44,6 @@ from nova.virt.xenapi import fake as xenapi_fake from nova.virt.xenapi import vm_utils from nova.virt.xenapi import vmops from nova.virt.xenapi import volume_utils -import nova.tests.api.openstack.fakes as api_fakes LOG = logging.getLogger(__name__) diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py index 531033a52..143970cfb 100644 --- a/nova/virt/xenapi/volume_utils.py +++ b/nova/virt/xenapi/volume_utils.py @@ -24,7 +24,6 @@ import string from nova import flags from nova import log as logging -from nova.virt import xenapi FLAGS = flags.FLAGS -- cgit