From 1c644d8dc12352b4b1f4ebb1700f9dcf029cbb4c Mon Sep 17 00:00:00 2001
From: Ondrej Novy <ondrej.novy@firma.seznam.cz>
Date: Thu, 30 Jul 2015 09:24:49 +0200
Subject: Test auth params together with --help option.

Change-Id: I2691739cc14bb8d384cc7ef0f8a3e73d1b898f88
---
 tests/unit/test_shell.py | 16 +++++++++++++---
 1 file 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)
-- 
cgit v1.2.1