openstack
/
python-swiftclient
Code Issues Proposed changes

Merge "Add test for --debug taking precedence over --info"

This commit is contained in:
Jenkins 2016-02-11 20:22:24 +00:00 committed by Gerrit Code Review
parent 2b391d47f0 28558c7e0a
commit a6f171437d
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/unit/test_shell.py
View File

@ -1298,7 +1298,7 @@ class TestSubcommandHelp(testtools.TestCase):
@mock.patch.dict(os.environ, mocked_os_environ)
class TestOptionAfterPosArg(testtools.TestCase):
class TestDebugAndInfoOptions(testtools.TestCase):
@mock.patch('logging.basicConfig')
@mock.patch('swiftclient.service.Connection')
def test_option_after_posarg(self, connection, mock_logging):
@ -1310,6 +1310,24 @@ class TestOptionAfterPosArg(testtools.TestCase):
swiftclient.shell.main(argv)
mock_logging.assert_called_with(level=logging.DEBUG)
@mock.patch('logging.basicConfig')
@mock.patch('swiftclient.service.Connection')
def test_debug_trumps_info(self, connection, mock_logging):
argv_scenarios = (["", "stat", "--info", "--debug"],
["", "stat", "--debug", "--info"],
["", "--info", "stat", "--debug"],
["", "--debug", "stat", "--info"],
["", "--info", "--debug", "stat"],
["", "--debug", "--info", "stat"])
for argv in argv_scenarios:
mock_logging.reset_mock()
swiftclient.shell.main(argv)
try:
mock_logging.assert_called_once_with(level=logging.DEBUG)
except AssertionError:
self.fail('Unexpected call(s) %r for args %r'
% (mock_logging.call_args_list, argv))
class TestBase(testtools.TestCase):
"""