Merge lp:~laney/software-properties/test-fixes into lp:software-properties

[Iain Lane]

AFAICS the change from https://code.launchpad.net/~smoser/software-properties/trunk.lp1532855/+merge/318132 broke the testsuite.

I think that add_key() needs to return a boolean. The one in ShortcutHandler constantly succeeds, so it seems that it should return True all the time. Please sanity check this.

Also the autopkgtests call gpg1 which isn't installed any more - I think they can just call gpg instead. At least they pass for me like this.

To reproduce, with working lxd:

  $ autopkgtest-build-lxd images:ubuntu/zesty/amd64
  $ autopkgtest --shell-fail -U --apt-pocket=proposed=src:software-properties /path/to/software-properties.dsc -- lxd autopkgtest/ubuntu/zesty/amd64

[Iain Lane (laney)]

Oh, to reproduce the failure, pass 'software-properties' instead of a dsc file (use the dsc to test the fix, or an amd64.changes if that changes file contains source too [e.g. sbuild ... -s]). In that case autopkgtest will get the package from the archive.

[Iain Lane (laney)]

Would you please review this?

[Scott Moser (smoser)]

thank you Iain.

=== modified file 'debian/changelog'
--- debian/changelog	2017-03-01 17:42:18 +0000
+++ debian/changelog	2017-03-02 15:04:20 +0000
@@ -1,3 +1,13 @@
+software-properties (0.96.24.10) UNRELEASED; urgency=medium
+
+  * debian/tests/run-tests: Use gpg, not gpg1.
+  * softwareproperties/shortcuts.py: Make add_key() return True. Since r988,
+    the return value of add_key() is now used to raise an exception.
+    ShortcutHandler.add_key() always succeeds, so should return True. This
+    fixes a testsuite failure.
+
+ -- Iain Lane <[e-mail]>  Thu, 02 Mar 2017 14:57:39 +0000
+
 software-properties (0.96.24.9) zesty; urgency=medium
 
   [ Scott Moser & Dimitri John Ledkov ]

=== modified file 'debian/tests/run-tests'
--- debian/tests/run-tests	2016-09-12 11:49:08 +0000
+++ debian/tests/run-tests	2017-03-02 15:04:20 +0000
@@ -16,7 +16,7 @@
 # dirmngr and/or gpg-agent fail without ~/.gnupg present maybe some
 # places should be properly declaring homedir, instead of just
 # keyrings
-gpg1 -k >/dev/null 2>&1
+gpg -k >/dev/null 2>&1
 
 code=0
 if [ "$TMPDIR" ]; then

=== modified file 'softwareproperties/shortcuts.py'
--- softwareproperties/shortcuts.py	2014-09-24 09:50:37 +0000
+++ softwareproperties/shortcuts.py	2017-03-02 15:04:20 +0000
@@ -31,7 +31,7 @@
         self.shortcut = shortcut
 
     def add_key(self, keyserver=None):
-        return None
+        return True
 
     def expand(self, codename=None, distro=None):
         return (self.shortcut, None)