fix more tests that use FLAGS setting

6 files changed, 1 insertions, 27 deletions

diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index 47bd8c1e4..049ddbc60 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -23,7 +23,6 @@ import random
 import string
 
 from nova import exception
-from nova import flags
 from nova import service
 from nova import test  # For the flags
 from nova.auth import manager
@@ -32,8 +31,6 @@ from nova.log import logging
 from nova.tests.integrated.api import client
 
 
-FLAGS = flags.FLAGS
-
 LOG = logging.getLogger('nova.tests.integrated')
 
 
@@ -151,6 +148,7 @@ class _IntegratedTestBase(test.TestCase):
 
         f = self._get_flags()
         self.flags(**f)
+        self.set_flags_verbosity(True)
 
         def fake_get_image_service(image_href):
             image_id = int(str(image_href).split('/')[-1])
diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py
index 0d4ee8cab..c22cf0be0 100644
--- a/nova/tests/integrated/test_extensions.py
+++ b/nova/tests/integrated/test_extensions.py
@@ -17,7 +17,6 @@
 
 import os
 
-from nova import flags
 from nova.log import logging
 from nova.tests.integrated import integrated_helpers
 
@@ -25,10 +24,6 @@ from nova.tests.integrated import integrated_helpers
 LOG = logging.getLogger('nova.tests.integrated')
 
 
-FLAGS = flags.FLAGS
-FLAGS.verbose = True
-
-
 class ExtensionsTest(integrated_helpers._IntegratedTestBase):
     def _get_flags(self):
         f = super(ExtensionsTest, self)._get_flags()
diff --git a/nova/tests/integrated/test_login.py b/nova/tests/integrated/test_login.py
index a5180b6bc..06359a52f 100644
--- a/nova/tests/integrated/test_login.py
+++ b/nova/tests/integrated/test_login.py
@@ -17,7 +17,6 @@
 
 import unittest
 
-from nova import flags
 from nova.log import logging
 from nova.tests.integrated import integrated_helpers
 from nova.tests.integrated.api import client
@@ -25,9 +24,6 @@ from nova.tests.integrated.api import client
 
 LOG = logging.getLogger('nova.tests.integrated')
 
-FLAGS = flags.FLAGS
-FLAGS.verbose = True
-
 
 class LoginTest(integrated_helpers._IntegratedTestBase):
     def test_login(self):
diff --git a/nova/tests/integrated/test_servers.py b/nova/tests/integrated/test_servers.py
index 67b3c485a..150279a95 100644
--- a/nova/tests/integrated/test_servers.py
+++ b/nova/tests/integrated/test_servers.py
@@ -18,7 +18,6 @@
 import time
 import unittest
 
-from nova import flags
 from nova.log import logging
 from nova.tests.integrated import integrated_helpers
 from nova.tests.integrated.api import client
@@ -27,10 +26,6 @@ from nova.tests.integrated.api import client
 LOG = logging.getLogger('nova.tests.integrated')
 
 
-FLAGS = flags.FLAGS
-FLAGS.verbose = True
-
-
 class ServersTest(integrated_helpers._IntegratedTestBase):
     def test_get_servers(self):
         """Simple check that listing servers works."""
diff --git a/nova/tests/integrated/test_volumes.py b/nova/tests/integrated/test_volumes.py
index e9fb3c4d1..d3e936462 100644
--- a/nova/tests/integrated/test_volumes.py
+++ b/nova/tests/integrated/test_volumes.py
@@ -18,7 +18,6 @@
 import unittest
 import time
 
-from nova import flags
 from nova.log import logging
 from nova.tests.integrated import integrated_helpers
 from nova.tests.integrated.api import client
@@ -28,10 +27,6 @@ from nova.volume import driver
 LOG = logging.getLogger('nova.tests.integrated')
 
 
-FLAGS = flags.FLAGS
-FLAGS.verbose = True
-
-
 class VolumesTest(integrated_helpers._IntegratedTestBase):
     def setUp(self):
         super(VolumesTest, self).setUp()
diff --git a/nova/tests/integrated/test_xml.py b/nova/tests/integrated/test_xml.py
index fde32f797..74baaacc2 100644
--- a/nova/tests/integrated/test_xml.py
+++ b/nova/tests/integrated/test_xml.py
@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from nova import flags
 from nova.log import logging
 from nova.tests.integrated import integrated_helpers
 from nova.api.openstack import common
@@ -24,10 +23,6 @@ from nova.api.openstack import common
 LOG = logging.getLogger('nova.tests.integrated')
 
 
-FLAGS = flags.FLAGS
-FLAGS.verbose = True
-
-
 class XmlTests(integrated_helpers._IntegratedTestBase):
     """"Some basic XML sanity checks."""