openstack/glance
Code Issues Proposed changes

Remove verbose option from glance tests

Browse Source 
verbose option is going to be deleted soon (see 
https://review.openstack.org/#/c/206437/ for more info
why it deprecated in oslo.log) because it confuses users 
(we already have debug option). So we need to delete it from glance
tests.

Change-Id: Iade46a6097d153f2df0da73554bbfd3e2b1704f5
This commit is contained in:
kairat_kushaev 2016-05-17 18:29:17 +03:00 committed by Kairat Kushaev
parent 9ec54a3f27
commit ecf8aea1e4
10 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/controllingservers.rst
View File

@ -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/

4
glance/tests/functional/__init__.py
View File

@ -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

2
glance/tests/functional/db/test_sqlalchemy.py
View File

@ -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

1
glance/tests/functional/test_bin_glance_cache_manage.py
View File

@ -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

1
glance/tests/functional/test_cache_middleware.py
View File

@ -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

17
glance/tests/functional/test_logging.py
View File

@ -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))

1
glance/tests/stubs.py
View File

@ -33,7 +33,6 @@ from glance.registry.api import v1 as rserver
from glance.tests import utils
VERBOSE = False
DEBUG = False

3
glance/tests/unit/base.py
View File

@ -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,

2
glance/tests/unit/v1/test_upload_utils.py
View File

@ -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()

2
glance/tests/unit/v2/test_image_data_resource.py
View File

@ -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(