Skip to content

Commit cb28cd9

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Rename context.py to logs.py"
2 parents 17ebd15 + 05800c4 commit cb28cd9

3 files changed

Lines changed: 34 additions & 36 deletions

File tree

openstackclient/common/context.py renamed to openstackclient/common/logs.py

File renamed without changes.

‎openstackclient/shell.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import openstackclient
3131
from openstackclient.common import clientmanager
3232
from openstackclient.common import commandmanager
33-
from openstackclient.common import context
3433
from openstackclient.common import exceptions as exc
34+
from openstackclient.common import logs
3535
from openstackclient.common import timing
3636
from openstackclient.common import utils
3737

@@ -103,7 +103,7 @@ def __init__(self):
103103

104104
def configure_logging(self):
105105
"""Configure logging for the app."""
106-
self.log_configurator = context.LogConfigurator(self.options)
106+
self.log_configurator = logs.LogConfigurator(self.options)
107107
self.dump_stack_trace = self.log_configurator.dump_trace
108108

109109
def run(self, argv):
@@ -249,8 +249,6 @@ def initialize_app(self, argv):
249249
cloud=self.options.cloud,
250250
argparse=self.options,
251251
)
252-
if self.options.debug is not None:
253-
self.options.debug = False
254252

255253
self.log_configurator.configure(self.cloud)
256254
self.dump_stack_trace = self.log_configurator.dump_trace

openstackclient/tests/common/test_context.py renamed to openstackclient/tests/common/test_logs.py

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import logging
1515
import mock
1616

17-
from openstackclient.common import context
17+
from openstackclient.common import logs
1818
from openstackclient.tests import utils
1919

2020

@@ -23,51 +23,51 @@ class TestContext(utils.TestCase):
2323
def test_log_level_from_options(self):
2424
opts = mock.Mock()
2525
opts.verbose_level = 0
26-
self.assertEqual(logging.ERROR, context.log_level_from_options(opts))
26+
self.assertEqual(logging.ERROR, logs.log_level_from_options(opts))
2727
opts.verbose_level = 1
28-
self.assertEqual(logging.WARNING, context.log_level_from_options(opts))
28+
self.assertEqual(logging.WARNING, logs.log_level_from_options(opts))
2929
opts.verbose_level = 2
30-
self.assertEqual(logging.INFO, context.log_level_from_options(opts))
30+
self.assertEqual(logging.INFO, logs.log_level_from_options(opts))
3131
opts.verbose_level = 3
32-
self.assertEqual(logging.DEBUG, context.log_level_from_options(opts))
32+
self.assertEqual(logging.DEBUG, logs.log_level_from_options(opts))
3333

3434
def test_log_level_from_config(self):
3535
cfg = {'verbose_level': 0}
36-
self.assertEqual(logging.ERROR, context.log_level_from_config(cfg))
36+
self.assertEqual(logging.ERROR, logs.log_level_from_config(cfg))
3737
cfg = {'verbose_level': 1}
38-
self.assertEqual(logging.WARNING, context.log_level_from_config(cfg))
38+
self.assertEqual(logging.WARNING, logs.log_level_from_config(cfg))
3939
cfg = {'verbose_level': 2}
40-
self.assertEqual(logging.INFO, context.log_level_from_config(cfg))
40+
self.assertEqual(logging.INFO, logs.log_level_from_config(cfg))
4141
cfg = {'verbose_level': 3}
42-
self.assertEqual(logging.DEBUG, context.log_level_from_config(cfg))
42+
self.assertEqual(logging.DEBUG, logs.log_level_from_config(cfg))
4343
cfg = {'verbose_level': 1, 'log_level': 'critical'}
44-
self.assertEqual(logging.CRITICAL, context.log_level_from_config(cfg))
44+
self.assertEqual(logging.CRITICAL, logs.log_level_from_config(cfg))
4545
cfg = {'verbose_level': 1, 'log_level': 'error'}
46-
self.assertEqual(logging.ERROR, context.log_level_from_config(cfg))
46+
self.assertEqual(logging.ERROR, logs.log_level_from_config(cfg))
4747
cfg = {'verbose_level': 1, 'log_level': 'warning'}
48-
self.assertEqual(logging.WARNING, context.log_level_from_config(cfg))
48+
self.assertEqual(logging.WARNING, logs.log_level_from_config(cfg))
4949
cfg = {'verbose_level': 1, 'log_level': 'info'}
50-
self.assertEqual(logging.INFO, context.log_level_from_config(cfg))
50+
self.assertEqual(logging.INFO, logs.log_level_from_config(cfg))
5151
cfg = {'verbose_level': 1, 'log_level': 'debug'}
52-
self.assertEqual(logging.DEBUG, context.log_level_from_config(cfg))
52+
self.assertEqual(logging.DEBUG, logs.log_level_from_config(cfg))
5353
cfg = {'verbose_level': 1, 'log_level': 'bogus'}
54-
self.assertEqual(logging.WARNING, context.log_level_from_config(cfg))
54+
self.assertEqual(logging.WARNING, logs.log_level_from_config(cfg))
5555
cfg = {'verbose_level': 1, 'log_level': 'info', 'debug': True}
56-
self.assertEqual(logging.DEBUG, context.log_level_from_config(cfg))
56+
self.assertEqual(logging.DEBUG, logs.log_level_from_config(cfg))
5757

5858
@mock.patch('warnings.simplefilter')
5959
def test_set_warning_filter(self, simplefilter):
60-
context.set_warning_filter(logging.ERROR)
60+
logs.set_warning_filter(logging.ERROR)
6161
simplefilter.assert_called_with("ignore")
62-
context.set_warning_filter(logging.WARNING)
62+
logs.set_warning_filter(logging.WARNING)
6363
simplefilter.assert_called_with("ignore")
64-
context.set_warning_filter(logging.INFO)
64+
logs.set_warning_filter(logging.INFO)
6565
simplefilter.assert_called_with("once")
6666

6767

6868
class TestFileFormatter(utils.TestCase):
6969
def test_nothing(self):
70-
formatter = context._FileFormatter()
70+
formatter = logs._FileFormatter()
7171
self.assertEqual(('%(asctime)s.%(msecs)03d %(process)d %(levelname)s '
7272
'%(name)s %(message)s'), formatter.fmt)
7373

@@ -77,7 +77,7 @@ class Opts(object):
7777
os_project_name = 'projecty'
7878
username = 'usernamey'
7979
options = Opts()
80-
formatter = context._FileFormatter(options=options)
80+
formatter = logs._FileFormatter(options=options)
8181
self.assertEqual(('%(asctime)s.%(msecs)03d %(process)d %(levelname)s '
8282
'%(name)s [cloudy usernamey projecty] %(message)s'),
8383
formatter.fmt)
@@ -86,7 +86,7 @@ def test_config(self):
8686
config = mock.Mock()
8787
config.config = {'cloud': 'cloudy'}
8888
config.auth = {'project_name': 'projecty', 'username': 'usernamey'}
89-
formatter = context._FileFormatter(config=config)
89+
formatter = logs._FileFormatter(config=config)
9090
self.assertEqual(('%(asctime)s.%(msecs)03d %(process)d %(levelname)s '
9191
'%(name)s [cloudy usernamey projecty] %(message)s'),
9292
formatter.fmt)
@@ -119,15 +119,15 @@ def setUp(self):
119119

120120
@mock.patch('logging.StreamHandler')
121121
@mock.patch('logging.getLogger')
122-
@mock.patch('openstackclient.common.context.set_warning_filter')
122+
@mock.patch('openstackclient.common.logs.set_warning_filter')
123123
def test_init(self, warning_filter, getLogger, handle):
124124
getLogger.side_effect = self.loggers
125125
console_logger = mock.Mock()
126126
console_logger.setFormatter = mock.Mock()
127127
console_logger.setLevel = mock.Mock()
128128
handle.return_value = console_logger
129129

130-
configurator = context.LogConfigurator(self.options)
130+
configurator = logs.LogConfigurator(self.options)
131131

132132
getLogger.assert_called_with('iso8601') # last call
133133
warning_filter.assert_called_with(logging.WARNING)
@@ -140,21 +140,21 @@ def test_init(self, warning_filter, getLogger, handle):
140140
self.assertEqual(False, configurator.dump_trace)
141141

142142
@mock.patch('logging.getLogger')
143-
@mock.patch('openstackclient.common.context.set_warning_filter')
143+
@mock.patch('openstackclient.common.logs.set_warning_filter')
144144
def test_init_no_debug(self, warning_filter, getLogger):
145145
getLogger.side_effect = self.loggers
146146
self.options.debug = True
147147

148-
configurator = context.LogConfigurator(self.options)
148+
configurator = logs.LogConfigurator(self.options)
149149

150150
warning_filter.assert_called_with(logging.DEBUG)
151151
self.requests_log.setLevel.assert_called_with(logging.DEBUG)
152152
self.assertEqual(True, configurator.dump_trace)
153153

154154
@mock.patch('logging.FileHandler')
155155
@mock.patch('logging.getLogger')
156-
@mock.patch('openstackclient.common.context.set_warning_filter')
157-
@mock.patch('openstackclient.common.context._FileFormatter')
156+
@mock.patch('openstackclient.common.logs.set_warning_filter')
157+
@mock.patch('openstackclient.common.logs._FileFormatter')
158158
def test_init_log_file(self, formatter, warning_filter, getLogger, handle):
159159
getLogger.side_effect = self.loggers
160160
self.options.log_file = '/tmp/log_file'
@@ -165,7 +165,7 @@ def test_init_log_file(self, formatter, warning_filter, getLogger, handle):
165165
mock_formatter = mock.Mock()
166166
formatter.return_value = mock_formatter
167167

168-
context.LogConfigurator(self.options)
168+
logs.LogConfigurator(self.options)
169169

170170
handle.assert_called_with(filename=self.options.log_file)
171171
self.root_logger.addHandler.assert_called_with(file_logger)
@@ -174,11 +174,11 @@ def test_init_log_file(self, formatter, warning_filter, getLogger, handle):
174174

175175
@mock.patch('logging.FileHandler')
176176
@mock.patch('logging.getLogger')
177-
@mock.patch('openstackclient.common.context.set_warning_filter')
178-
@mock.patch('openstackclient.common.context._FileFormatter')
177+
@mock.patch('openstackclient.common.logs.set_warning_filter')
178+
@mock.patch('openstackclient.common.logs._FileFormatter')
179179
def test_configure(self, formatter, warning_filter, getLogger, handle):
180180
getLogger.side_effect = self.loggers
181-
configurator = context.LogConfigurator(self.options)
181+
configurator = logs.LogConfigurator(self.options)
182182
cloud_config = mock.Mock()
183183
config_log = '/tmp/config_log'
184184
cloud_config.config = {

0 commit comments

Comments
 (0)