diff --git a/doc/source/controllingservers.rst b/doc/source/controllingservers.rst index 65aa23d69c..fd7cfd70ca 100644 --- a/doc/source/controllingservers.rst +++ b/doc/source/controllingservers.rst @@ -78,7 +78,6 @@ Here is an example showing how you can manually start the ``glance-api`` server 2011-04-13 14:50:12 DEBUG [glance-api] filesystem_store_datadir /home/jsuh/images/ 2011-04-13 14:50:12 DEBUG [glance-api] registry_host 65.114.169.29 2011-04-13 14:50:12 DEBUG [glance-api] registry_port 9191 - 2011-04-13 14:50:12 DEBUG [glance-api] verbose False 2011-04-13 14:50:12 DEBUG [glance-api] ******************************************************************************** 2011-04-13 14:50:12 DEBUG [routes.middleware] Initialized with method overriding = True, and path info altering = True 2011-04-13 14:50:12 DEBUG [eventlet.wsgi.server] (21354) wsgi starting up on http://65.114.169.29:9292/ diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py index dec2eb22df..34008f0d25 100644 --- a/glance/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -63,7 +63,6 @@ class Server(object): passed from the FunctionalTestCase. :param port: The port to start a server up on. """ - self.verbose = True self.debug = True self.no_venv = False self.test_dir = test_dir @@ -320,7 +319,6 @@ class ApiServer(Server): self.send_identity_headers = False self.conf_base = """[DEFAULT] -verbose = %(verbose)s debug = %(debug)s default_log_levels = eventlet.wsgi.server=DEBUG bind_host = 127.0.0.1 @@ -476,7 +474,6 @@ class RegistryServer(Server): self.disable_path = None self.conf_base = """[DEFAULT] -verbose = %(verbose)s debug = %(debug)s bind_host = 127.0.0.1 bind_port = %(bind_port)s @@ -554,7 +551,6 @@ class ScrubberDaemon(Server): self.admin_role = 'admin' self.conf_base = """[DEFAULT] -verbose = %(verbose)s debug = %(debug)s log_file = %(log_file)s daemon = %(daemon)s diff --git a/glance/tests/functional/db/test_sqlalchemy.py b/glance/tests/functional/db/test_sqlalchemy.py index 8ede05a2b0..20575d14e2 100644 --- a/glance/tests/functional/db/test_sqlalchemy.py +++ b/glance/tests/functional/db/test_sqlalchemy.py @@ -32,7 +32,7 @@ CONF = cfg.CONF def get_db(config): options.set_defaults(CONF, connection='sqlite://') - config(verbose=False, debug=False) + config(debug=False) db_api = glance.db.sqlalchemy.api return db_api diff --git a/glance/tests/functional/test_bin_glance_cache_manage.py b/glance/tests/functional/test_bin_glance_cache_manage.py index 9488d1dd25..f120f7b3df 100644 --- a/glance/tests/functional/test_bin_glance_cache_manage.py +++ b/glance/tests/functional/test_bin_glance_cache_manage.py @@ -217,7 +217,6 @@ class TestBinGlanceCacheManage(functional.FunctionalTest): with open(cache_config_filepath, 'w') as cache_file: cache_file.write("""[DEFAULT] debug = True -verbose = True image_cache_dir = %(image_cache_dir)s image_cache_driver = %(image_cache_driver)s registry_host = 127.0.0.1 diff --git a/glance/tests/functional/test_cache_middleware.py b/glance/tests/functional/test_cache_middleware.py index 9e940780ce..fafeca0fb3 100644 --- a/glance/tests/functional/test_cache_middleware.py +++ b/glance/tests/functional/test_cache_middleware.py @@ -759,7 +759,6 @@ class BaseCacheManageMiddlewareTest(object): with open(cache_config_filepath, 'w') as cache_file: cache_file.write("""[DEFAULT] debug = True -verbose = True image_cache_dir = %(image_cache_dir)s image_cache_driver = %(image_cache_driver)s registry_host = 127.0.0.1 diff --git a/glance/tests/functional/test_logging.py b/glance/tests/functional/test_logging.py index fade24616c..cb3008b460 100644 --- a/glance/tests/functional/test_logging.py +++ b/glance/tests/functional/test_logging.py @@ -27,17 +27,15 @@ class TestLogging(functional.FunctionalTest): """Functional tests for Glance's logging output""" - def test_verbose_debug(self): + def test_debug(self): """ - Test logging output proper when verbose and debug - is on. + Test logging output proper when debug is on. """ self.cleanup() self.start_servers() - # The default functional test case has both verbose - # and debug on. Let's verify that debug statements - # appear in both the API and registry logs. + # The default functional test case has both debug on. Let's verify + # that debug statements appear in both the API and registry logs. self.assertTrue(os.path.exists(self.api_server.log_file)) @@ -53,13 +51,12 @@ class TestLogging(functional.FunctionalTest): self.stop_servers() - def test_no_verbose_no_debug(self): + def test_no_debug(self): """ - Test logging output proper when verbose and debug - is off. + Test logging output proper when debug is off. """ self.cleanup() - self.start_servers(debug=False, verbose=False) + self.start_servers(debug=False) self.assertTrue(os.path.exists(self.api_server.log_file)) diff --git a/glance/tests/stubs.py b/glance/tests/stubs.py index 89394a9e5e..1358b69f55 100644 --- a/glance/tests/stubs.py +++ b/glance/tests/stubs.py @@ -33,7 +33,6 @@ from glance.registry.api import v1 as rserver from glance.tests import utils -VERBOSE = False DEBUG = False diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py index 4b8cf1c4db..6af07b8814 100644 --- a/glance/tests/unit/base.py +++ b/glance/tests/unit/base.py @@ -68,8 +68,7 @@ class IsolatedUnitTest(StoreClearingUnitTest): sqlite_db='glance.sqlite') lockutils.set_defaults(os.path.join(self.test_dir)) - self.config(verbose=False, - debug=False) + self.config(debug=False) self.config(default_store='filesystem', filesystem_store_datadir=self.test_dir, diff --git a/glance/tests/unit/v1/test_upload_utils.py b/glance/tests/unit/v1/test_upload_utils.py index e7c4c1be02..da12bd0256 100644 --- a/glance/tests/unit/v1/test_upload_utils.py +++ b/glance/tests/unit/v1/test_upload_utils.py @@ -32,7 +32,7 @@ import glance.tests.unit.utils as unit_test_utils class TestUploadUtils(base.StoreClearingUnitTest): def setUp(self): super(TestUploadUtils, self).setUp() - self.config(verbose=True, debug=True) + self.config(debug=True) def tearDown(self): super(TestUploadUtils, self).tearDown() diff --git a/glance/tests/unit/v2/test_image_data_resource.py b/glance/tests/unit/v2/test_image_data_resource.py index db09285334..58ced70b38 100644 --- a/glance/tests/unit/v2/test_image_data_resource.py +++ b/glance/tests/unit/v2/test_image_data_resource.py @@ -96,7 +96,7 @@ class TestImagesController(base.StoreClearingUnitTest): def setUp(self): super(TestImagesController, self).setUp() - self.config(verbose=True, debug=True) + self.config(debug=True) self.image_repo = FakeImageRepo() self.gateway = FakeGateway(self.image_repo) self.controller = glance.api.v2.image_data.ImageDataController(