summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorStanislaw Pitucha <stanislaw.pitucha@hp.com>2013-04-10 13:26:12 +0000
committerStanislaw Pitucha <stanislaw.pitucha@hp.com>2013-04-10 13:26:12 +0000
commit17ba935d9da2ff912196bb47f6856fb64db13247 (patch)
treef55579924661c2413b374f4f0aaaddea8a9574e5 /nova/tests
parenta993b2b969bad0785aad02dc2a6f04ac0c675f8d (diff)
Remove unnecessary LOG initialisation
Remove a lot of getLogger lines and imports of logging in modules which never use that functionality. Change-Id: Icdaee2c540980412b000d02ebf1ec568dcf5b38a
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/ec2/test_cinder_cloud.py2
-rw-r--r--nova/tests/api/ec2/test_ec2_validate.py2
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py2
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_aggregates.py2
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_hosts.py3
-rw-r--r--nova/tests/api/openstack/compute/test_urlmap.py3
-rw-r--r--nova/tests/compute/test_claims.py3
-rw-r--r--nova/tests/compute/test_compute_cells.py3
-rw-r--r--nova/tests/compute/test_compute_utils.py2
-rw-r--r--nova/tests/compute/test_resource_tracker.py3
-rw-r--r--nova/tests/consoleauth/test_consoleauth.py3
-rw-r--r--nova/tests/network/test_network_info.py3
-rw-r--r--nova/tests/test_configdrive2.py3
-rw-r--r--nova/tests/test_imagecache.py2
-rw-r--r--nova/tests/test_instance_types.py3
-rw-r--r--nova/tests/test_ipv6.py3
-rw-r--r--nova/tests/test_libvirt.py2
-rw-r--r--nova/tests/test_notifications.py2
-rw-r--r--nova/tests/test_powervm.py3
19 files changed, 0 insertions, 49 deletions
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py
index c29f77daa..b3c816659 100644
--- a/nova/tests/api/ec2/test_cinder_cloud.py
+++ b/nova/tests/api/ec2/test_cinder_cloud.py
@@ -31,7 +31,6 @@ from nova.compute import utils as compute_utils
from nova import context
from nova import db
from nova import exception
-from nova.openstack.common import log as logging
from nova.openstack.common import rpc
from nova import test
from nova.tests import fake_network
@@ -43,7 +42,6 @@ CONF = cfg.CONF
CONF.import_opt('compute_driver', 'nova.virt.driver')
CONF.import_opt('default_instance_type', 'nova.compute.instance_types')
CONF.import_opt('use_ipv6', 'nova.netconf')
-LOG = logging.getLogger(__name__)
def get_fake_cache():
diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py
index 9b67d67a1..359a8fee3 100644
--- a/nova/tests/api/ec2/test_ec2_validate.py
+++ b/nova/tests/api/ec2/test_ec2_validate.py
@@ -26,7 +26,6 @@ from nova.compute import utils as compute_utils
from nova import context
from nova import db
from nova import exception
-from nova.openstack.common import log as logging
from nova.openstack.common import rpc
from nova.openstack.common import timeutils
from nova import test
@@ -35,7 +34,6 @@ from nova.tests.image import fake
CONF = cfg.CONF
CONF.import_opt('compute_driver', 'nova.virt.driver')
-LOG = logging.getLogger(__name__)
class EC2ValidateTestCase(test.TestCase):
diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py
index 1e88d8047..0c5dea2c8 100644
--- a/nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py
+++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions_with_cells.py
@@ -21,12 +21,10 @@ Tests For Compute admin api w/ Cells
from nova.api.openstack.compute.contrib import admin_actions
from nova.compute import cells_api as compute_cells_api
from nova.compute import vm_states
-from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils
from nova import test
from nova.tests.api.openstack import fakes
-LOG = logging.getLogger('nova.tests.test_compute_cells')
INSTANCE_IDS = {'inst_id': 1}
diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
index bb513bf7d..1f3c161d6 100644
--- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py
+++ b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
@@ -20,11 +20,9 @@ from webob import exc
from nova.api.openstack.compute.contrib import aggregates
from nova import context
from nova import exception
-from nova.openstack.common import log as logging
from nova import test
from nova.tests import matchers
-LOG = logging.getLogger(__name__)
AGGREGATE_LIST = [
{"name": "aggregate1", "id": "1", "availability_zone": "nova1"},
{"name": "aggregate2", "id": "2", "availability_zone": "nova1"},
diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py
index 60e8f6e1f..326f0fd64 100644
--- a/nova/tests/api/openstack/compute/contrib/test_hosts.py
+++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py
@@ -23,13 +23,10 @@ from nova.compute import vm_states
from nova import context as context_maker
from nova import db
from nova import exception
-from nova.openstack.common import log as logging
from nova import test
from nova.tests import fake_hosts
from nova.tests import utils
-LOG = logging.getLogger(__name__)
-
def stub_service_get_all(context, disabled=None):
return fake_hosts.SERVICES_LIST
diff --git a/nova/tests/api/openstack/compute/test_urlmap.py b/nova/tests/api/openstack/compute/test_urlmap.py
index 8cb98944c..b0ca5ed7c 100644
--- a/nova/tests/api/openstack/compute/test_urlmap.py
+++ b/nova/tests/api/openstack/compute/test_urlmap.py
@@ -16,13 +16,10 @@
import webob
from nova.openstack.common import jsonutils
-from nova.openstack.common import log as logging
from nova import test
from nova.tests.api.openstack import fakes
import nova.tests.image.fake
-LOG = logging.getLogger(__name__)
-
class UrlmapTest(test.TestCase):
def setUp(self):
diff --git a/nova/tests/compute/test_claims.py b/nova/tests/compute/test_claims.py
index 42de11c09..e00b4bb24 100644
--- a/nova/tests/compute/test_claims.py
+++ b/nova/tests/compute/test_claims.py
@@ -20,11 +20,8 @@
import uuid
from nova.compute import claims
-from nova.openstack.common import log as logging
from nova import test
-LOG = logging.getLogger(__name__)
-
class DummyTracker(object):
icalled = False
diff --git a/nova/tests/compute/test_compute_cells.py b/nova/tests/compute/test_compute_cells.py
index bafb3e920..952a557fb 100644
--- a/nova/tests/compute/test_compute_cells.py
+++ b/nova/tests/compute/test_compute_cells.py
@@ -25,13 +25,10 @@ from nova.compute import cells_api as compute_cells_api
from nova import db
from nova import exception
from nova.openstack.common import jsonutils
-from nova.openstack.common import log as logging
from nova import quota
from nova.tests.compute import test_compute
-LOG = logging.getLogger('nova.tests.test_compute_cells')
-
ORIG_COMPUTE_API = None
cfg.CONF.import_opt('enable', 'nova.cells.opts', group='cells')
diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py
index 2de9d0beb..52888c112 100644
--- a/nova/tests/compute/test_compute_utils.py
+++ b/nova/tests/compute/test_compute_utils.py
@@ -29,7 +29,6 @@ from nova import exception
from nova.image import glance
from nova.network import api as network_api
from nova.openstack.common import importutils
-from nova.openstack.common import log as logging
from nova.openstack.common.notifier import api as notifier_api
from nova.openstack.common.notifier import test_notifier
from nova import test
@@ -37,7 +36,6 @@ from nova.tests import fake_instance_actions
from nova.tests import fake_network
import nova.tests.image.fake
-LOG = logging.getLogger(__name__)
CONF = cfg.CONF
CONF.import_opt('compute_manager', 'nova.service')
CONF.import_opt('compute_driver', 'nova.virt.driver')
diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py
index c03ccbe28..aa4c5490d 100644
--- a/nova/tests/compute/test_resource_tracker.py
+++ b/nova/tests/compute/test_resource_tracker.py
@@ -27,13 +27,10 @@ from nova.compute import task_states
from nova.compute import vm_states
from nova import context
from nova import db
-from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
from nova import test
from nova.virt import driver
-LOG = logging.getLogger(__name__)
-
FAKE_VIRT_MEMORY_MB = 5
FAKE_VIRT_LOCAL_GB = 6
diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py
index 024434c0a..41bec05e1 100644
--- a/nova/tests/consoleauth/test_consoleauth.py
+++ b/nova/tests/consoleauth/test_consoleauth.py
@@ -22,12 +22,9 @@ Tests for Consoleauth Code.
from nova.consoleauth import manager
from nova import context
-from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
from nova import test
-LOG = logging.getLogger(__name__)
-
class ConsoleauthTestCase(test.TestCase):
"""Test Case for consoleauth."""
diff --git a/nova/tests/network/test_network_info.py b/nova/tests/network/test_network_info.py
index 021e6b5e6..960f3583a 100644
--- a/nova/tests/network/test_network_info.py
+++ b/nova/tests/network/test_network_info.py
@@ -17,12 +17,9 @@
from nova import exception
from nova.network import model
-from nova.openstack.common import log as logging
from nova import test
from nova.tests import fake_network_cache_model
-LOG = logging.getLogger(__name__)
-
class RouteTests(test.TestCase):
def test_create_route_with_attrs(self):
diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py
index 28fa423e0..a71a01f8f 100644
--- a/nova/tests/test_configdrive2.py
+++ b/nova/tests/test_configdrive2.py
@@ -22,12 +22,9 @@ import tempfile
from nova import test
-from nova.openstack.common import log
from nova import utils
from nova.virt import configdrive
-LOG = log.getLogger(__name__)
-
class ConfigDriveTestCase(test.TestCase):
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py
index b225a2116..02cc7337a 100644
--- a/nova/tests/test_imagecache.py
+++ b/nova/tests/test_imagecache.py
@@ -39,8 +39,6 @@ CONF = cfg.CONF
CONF.import_opt('compute_manager', 'nova.service')
CONF.import_opt('host', 'nova.netconf')
-LOG = logging.getLogger(__name__)
-
class ImageCacheManagerTestCase(test.TestCase):
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index 147ab25f7..5c8b4be14 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -23,11 +23,8 @@ from nova import db
from nova.db.sqlalchemy import models
from nova import exception
from nova.openstack.common.db.sqlalchemy import session as sql_session
-from nova.openstack.common import log as logging
from nova import test
-LOG = logging.getLogger(__name__)
-
class InstanceTypeTestCase(test.TestCase):
"""Test cases for instance type code."""
diff --git a/nova/tests/test_ipv6.py b/nova/tests/test_ipv6.py
index df3d34c1f..6064b0185 100644
--- a/nova/tests/test_ipv6.py
+++ b/nova/tests/test_ipv6.py
@@ -17,11 +17,8 @@
"""Test suite for IPv6."""
from nova import ipv6
-from nova.openstack.common import log as logging
from nova import test
-LOG = logging.getLogger(__name__)
-
class IPv6RFC2462TestCase(test.TestCase):
"""Unit tests for IPv6 rfc2462 backend operations."""
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 1413eb98c..e26c25ff1 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -42,7 +42,6 @@ from nova import exception
from nova.openstack.common import fileutils
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
-from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils
from nova import test
from nova.tests import fake_libvirt_utils
@@ -77,7 +76,6 @@ CONF.import_opt('compute_manager', 'nova.service')
CONF.import_opt('host', 'nova.netconf')
CONF.import_opt('my_ip', 'nova.netconf')
CONF.import_opt('base_dir_name', 'nova.virt.libvirt.imagecache')
-LOG = logging.getLogger(__name__)
_fake_network_info = fake_network.fake_get_instance_nw_info
_fake_stub_out_get_nw_info = fake_network.stub_out_nw_api_get_instance_nw_info
diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py
index 0c50d4933..68ef540b1 100644
--- a/nova/tests/test_notifications.py
+++ b/nova/tests/test_notifications.py
@@ -28,7 +28,6 @@ from nova import context
from nova import db
from nova.network import api as network_api
from nova import notifications
-from nova.openstack.common import log as logging
from nova.openstack.common.notifier import api as notifier_api
from nova.openstack.common.notifier import test_notifier
from nova import test
@@ -36,7 +35,6 @@ from nova.tests import fake_network
CONF = cfg.CONF
CONF.import_opt('compute_driver', 'nova.virt.driver')
-LOG = logging.getLogger(__name__)
class NotificationsTestCase(test.TestCase):
diff --git a/nova/tests/test_powervm.py b/nova/tests/test_powervm.py
index 0ba9dce9a..572c0f946 100644
--- a/nova/tests/test_powervm.py
+++ b/nova/tests/test_powervm.py
@@ -28,7 +28,6 @@ from nova.compute import instance_types
from nova.compute import power_state
from nova.compute import task_states
from nova.network import model as network_model
-from nova.openstack.common import log as logging
from nova.tests import fake_network_cache_model
from nova.tests.image import fake
from nova.virt import images
@@ -39,8 +38,6 @@ from nova.virt.powervm import exception
from nova.virt.powervm import lpar
from nova.virt.powervm import operator
-LOG = logging.getLogger(__name__)
-
def fake_lpar(instance_name):
return lpar.LPAR(name=instance_name,