tests: Add a bunch more login tests

crobinso · crobinso · commit e54e1d95a060 · 2015-11-19T17:00:36.000-05:00
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -9,12 +9,12 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
+import getpass
 import locale
 from logging import getLogger
 import os
 import sys
 
-from getpass import getpass
 from io import BytesIO
 
 if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
@@ -670,7 +670,7 @@ def interactive_login(self, user=None, password=None, force=False):
             sys.stdout.write('Bugzilla Username: ')
             user = sys.stdin.readline().strip()
         if not password:
-            password = getpass('Bugzilla Password: ')
+            password = getpass.getpass('Bugzilla Password: ')
 
         log.info('Logging in... ')
         self.login(user, password)
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -57,7 +57,7 @@ def difffile(expect, filename):
 
 
 def clicomm(argv, bzinstance, returnmain=False, printcliout=False,
-            stdin=None, expectfail=False):
+            stdin=None, stdinstr=None, expectfail=False):
     """
     Run bin/bugzilla.main() directly with passed argv
     """
@@ -75,6 +75,9 @@ def clicomm(argv, bzinstance, returnmain=False, printcliout=False,
             sys.stderr = out
             if stdin:
                 sys.stdin = stdin
+            elif stdinstr:
+                sys.stdin = StringIO(stdinstr)
+
         sys.argv = argv
 
         ret = 0
diff --git a/tests/rw_functional.py b/tests/rw_functional.py
@@ -625,11 +625,47 @@ def test10Login(self):
         """
         Failed login test, gives us a bit more coverage
         """
-        ret = tests.clicomm("bugzilla --bugzilla %s "
-                            "--user foobar@example.com "
-                            "--password foobar login" % self.url, None,
-                            expectfail=True)
-        self.assertTrue("Login failed: " in ret)
+        # We overwrite getpass for testing
+        import getpass
+
+        def fakegetpass(prompt):
+            sys.stdout.write(prompt)
+            sys.stdout.flush()
+            return sys.stdin.readline()
+        oldgetpass = getpass.getpass
+        getpass.getpass = fakegetpass
+
+        try:
+            # Implied login with --username and --password
+            ret = tests.clicomm("bugzilla --bugzilla %s "
+                                "--user foobar@example.com "
+                                "--password foobar query -b 123456" % self.url,
+                                None, expectfail=True)
+            self.assertTrue("Login failed: " in ret)
+
+            # 'login' with explicit options
+            ret = tests.clicomm("bugzilla --bugzilla %s "
+                                "--user foobar@example.com "
+                                "--password foobar login" % self.url,
+                                None, expectfail=True)
+            self.assertTrue("Login failed: " in ret)
+
+            # 'login' with positional options
+            ret = tests.clicomm("bugzilla --bugzilla %s "
+                                "login foobar@example.com foobar" % self.url,
+                                None, expectfail=True)
+            self.assertTrue("Login failed: " in ret)
+
+
+            # bare 'login'
+            stdinstr = "foobar@example.com\n\rfoobar\n\r"
+            ret = tests.clicomm("bugzilla --bugzilla %s login" % self.url,
+                                None, expectfail=True, stdinstr=stdinstr)
+            self.assertTrue("Bugzilla Username:" in ret)
+            self.assertTrue("Bugzilla Password:" in ret)
+            self.assertTrue("Login failed: " in ret)
+        finally:
+            getpass.getpass = oldgetpass
 
 
     def test10LoginState(self):
