summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/unit/test_shell.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/tests/unit/test_shell.py b/tests/unit/test_shell.py
index 8384f7a..17ac995 100644
--- a/tests/unit/test_shell.py
+++ b/tests/unit/test_shell.py
@@ -1271,9 +1271,19 @@ class TestParsing(TestBase):
# --help returns condensed help message, overrides --os-help
opts = {"help": ""}
os_opts = {"help": ""}
- # "password": "secret",
- # "username": "user",
- # "auth_url": "http://example.com:5000/v3"}
+ args = _make_args("", opts, os_opts)
+ with CaptureOutput() as out:
+ self.assertRaises(SystemExit, swiftclient.shell.main, args)
+ self.assertTrue(out.find('[--key <api_key>]') > 0)
+ self.assertEqual(-1, out.find('--os-username=<auth-user-name>'))
+
+ # --os-password, --os-username and --os-auth_url should be ignored
+ # because --help overrides it
+ opts = {"help": ""}
+ os_opts = {"help": "",
+ "password": "secret",
+ "username": "user",
+ "auth_url": "http://example.com:5000/v3"}
args = _make_args("", opts, os_opts)
with CaptureOutput() as out:
self.assertRaises(SystemExit, swiftclient.shell.main, args)