Bugzilla: Move login success printing into interactive_login

crobinso · crobinso · commit 20c480ba4db4 · 2020-01-12T14:55:59.000-05:00
We already do some printing there, this unifies it. Extend the
printing to report when we actually save the token to disk, and
where we save it.

Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_cli.py b/bugzilla/_cli.py
@@ -1053,11 +1053,6 @@ def _handle_login(opt, action, bz):
         sys.exit(1)
 
     if is_login_command:
-        msg = "Login successful."
-        if (bz.cookiefile or bz.tokenfile) and not use_key:
-            msg = "Login successful, token cache updated."
-
-        print(msg)
         sys.exit(0)
 
 
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -629,11 +629,12 @@ def _ask_api_key(self):
         log.info('API Key accepted')
 
         wrote_filename = self._rcfile.save_api_key(self.url, self.api_key)
+        log.info("API key written to filename=%s", wrote_filename)
+
+        msg = "Login successful."
         if wrote_filename:
-            log.info("API key written to %s", wrote_filename)
-            print("API key written to %s" % wrote_filename)
-        else:  # pragma: no cover
-            log.info("API Key won't be updated because use_creds=False")
+            msg += " API key written to %s" % wrote_filename
+        print(msg)
 
     def interactive_login(self, user=None, password=None, force=False,
                           restrict_login=None, use_api_key=False):
@@ -661,7 +662,11 @@ def interactive_login(self, user=None, password=None, force=False,
             password = getpass.getpass('Bugzilla Password: ')
 
         log.info('Logging in... ')
-        self.login(user, password, restrict_login)
+        out = self.login(user, password, restrict_login)
+        msg = "Login successful."
+        if "token" in out and self.tokenfile:
+            msg += " Token cache saved to %s" % self.tokenfile
+        print(msg)
 
     def logout(self):
         """
diff --git a/tests/test_cli_login.py b/tests/test_cli_login.py
@@ -58,12 +58,13 @@ def test_login(run_cli):
 
     # Returns success for logged_in check and hits a tokenfile line
     cmd = "bugzilla --ensure-logged-in "
-    cmd += "--user FOO --password BAR login"
+    cmd += "login FOO BAR"
     fakebz = tests.mockbackend.make_bz(
         bz_kwargs={"use_creds": True},
         user_login_args="data/mockargs/test_login.txt",
-        user_login_return={},
+        user_login_return={'id': 1234, 'token': 'my-fake-token'},
         user_get_args=None,
         user_get_return={})
     out = run_cli(cmd, fakebz)
-    assert "token cache updated" in out
+    assert "Token cache saved" in out
+    assert fakebz.tokenfile in out
