summaryrefslogtreecommitdiff
path: root/openstackclient/tests
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2016-06-09 16:29:42 -0500
committerDean Troyer <dtroyer@gmail.com>2016-06-13 10:55:44 -0500
commit59dffb9c62b48dbf5e99395e8f58e317e43cf036 (patch)
treed9cdb1f6b325a8c4417b5c484c5407812488bf9f /openstackclient/tests
parente5e29a8fef7ba2396015918545a49e717fe75d15 (diff)
downloadpython-openstackclient-59dffb9c62b48dbf5e99395e8f58e317e43cf036.tar.gz
osc-lib: logs
Change-Id: I2a4d40cd72cc22e97a600751ae29c2309ebed28b
Diffstat (limited to 'openstackclient/tests')
-rw-r--r--openstackclient/tests/common/test_logs.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/openstackclient/tests/common/test_logs.py b/openstackclient/tests/common/test_logs.py
index 0386cdfd..5091510c 100644
--- a/openstackclient/tests/common/test_logs.py
+++ b/openstackclient/tests/common/test_logs.py
@@ -11,6 +11,9 @@
# under the License.
#
+# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
+# or Jun 2017.
+
import logging
import mock
@@ -121,7 +124,7 @@ class TestLogConfigurator(utils.TestCase):
@mock.patch('logging.StreamHandler')
@mock.patch('logging.getLogger')
- @mock.patch('openstackclient.common.logs.set_warning_filter')
+ @mock.patch('osc_lib.logs.set_warning_filter')
def test_init(self, warning_filter, getLogger, handle):
getLogger.side_effect = self.loggers
console_logger = mock.Mock()
@@ -142,7 +145,7 @@ class TestLogConfigurator(utils.TestCase):
self.assertFalse(configurator.dump_trace)
@mock.patch('logging.getLogger')
- @mock.patch('openstackclient.common.logs.set_warning_filter')
+ @mock.patch('osc_lib.logs.set_warning_filter')
def test_init_no_debug(self, warning_filter, getLogger):
getLogger.side_effect = self.loggers
self.options.debug = True
@@ -155,8 +158,8 @@ class TestLogConfigurator(utils.TestCase):
@mock.patch('logging.FileHandler')
@mock.patch('logging.getLogger')
- @mock.patch('openstackclient.common.logs.set_warning_filter')
- @mock.patch('openstackclient.common.logs._FileFormatter')
+ @mock.patch('osc_lib.logs.set_warning_filter')
+ @mock.patch('osc_lib.logs._FileFormatter')
def test_init_log_file(self, formatter, warning_filter, getLogger, handle):
getLogger.side_effect = self.loggers
self.options.log_file = '/tmp/log_file'
@@ -176,8 +179,8 @@ class TestLogConfigurator(utils.TestCase):
@mock.patch('logging.FileHandler')
@mock.patch('logging.getLogger')
- @mock.patch('openstackclient.common.logs.set_warning_filter')
- @mock.patch('openstackclient.common.logs._FileFormatter')
+ @mock.patch('osc_lib.logs.set_warning_filter')
+ @mock.patch('osc_lib.logs._FileFormatter')
def test_configure(self, formatter, warning_filter, getLogger, handle):
getLogger.side_effect = self.loggers
configurator = logs.LogConfigurator(self.options)