Merge lp:~ddstreet/launchpadlib/sudotests into lp:launchpadlib

[Dan Streetman]

[Dan Streetman (ddstreet)]

MR to add python3-mock as build and test dep here:
https://salsa.debian.org/python-team/modules/python-launchpadlib/-/merge_requests/2

[Dan Streetman (ddstreet)]

Passes autopkgtest using my test build
https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal-ddstreet-sponsor/focal/amd64/p/python-launchpadlib/20200418_211128_21ede@/log.gz

[Colin Watson (cjwatson)]

Ah, right, that makes sense. Will merge, thanks!

review: Approve

[Colin Watson (cjwatson)]

The packaging change can be avoided by using the standard library unittest.mock instead in the Python 3 case. I'll do that as part of the merge.

=== modified file 'src/launchpadlib/tests/test_launchpad.py'
--- src/launchpadlib/tests/test_launchpad.py	2019-11-07 17:40:56 +0000
+++ src/launchpadlib/tests/test_launchpad.py	2020-04-18 20:15:43 +0000
@@ -19,6 +19,7 @@
 __metaclass__ = type
 
 from contextlib import contextmanager
+from mock import patch
 import os
 import shutil
 import socket
@@ -612,6 +613,7 @@
         launchpadlib.launchpad.socket = socket
         shutil.rmtree(self.temp_dir)
 
+    @patch.object(NoNetworkLaunchpad, '_is_sudo', lambda: False)
     def test_credentials_save_failed(self):
         # If saving the credentials did not succeed and a callback was
         # provided, it is called.
@@ -631,6 +633,7 @@
                 credential_save_failed=callback)
             self.assertEqual(len(callback_called), 1)
 
+    @patch.object(NoNetworkLaunchpad, '_is_sudo', lambda: False)
     def test_default_credentials_save_failed_is_to_raise_exception(self):
         # If saving the credentials did not succeed and no callback was
         # provided, the underlying exception is raised.
@@ -643,6 +646,17 @@
                 'not important', service_root=service_root,
                 launchpadlib_dir=launchpadlib_dir)
 
+    @patch.object(NoNetworkLaunchpad, '_is_sudo', lambda: True)
+    def test_credentials_save_fail_under_sudo_does_not_raise_exception(self):
+        # When running under sudo, Launchpad will not attempt to use
+        # the keyring, so credential save failure will never happen
+        launchpadlib_dir = os.path.join(self.temp_dir, 'launchpadlib')
+        service_root = "http://api.example.com/"
+        with fake_keyring(BadSaveKeyring()):
+            NoNetworkLaunchpad.login_with(
+                'not important', service_root=service_root,
+                launchpadlib_dir=launchpadlib_dir)
+
 
 class TestMultipleSites(unittest.TestCase):
     # If the same application name (consumer name) is used to access more than
@@ -660,6 +674,7 @@
         launchpadlib.launchpad.socket = socket
         shutil.rmtree(self.temp_dir)
 
+    @patch.object(NoNetworkLaunchpad, '_is_sudo', lambda: False)
     def test_components_of_application_key(self):
         launchpadlib_dir = os.path.join(self.temp_dir, 'launchpadlib')
         keyring = InMemoryKeyring()
@@ -684,6 +699,7 @@
         # "forgotten").
         self.assertEqual(application_key, consumer_name + '@' + service_root)
 
+    @patch.object(NoNetworkLaunchpad, '_is_sudo', lambda: False)
     def test_same_app_different_servers(self):
         launchpadlib_dir = os.path.join(self.temp_dir, 'launchpadlib')
         keyring = InMemoryKeyring()