Merge lp:~smoser/software-properties/trunk.lp1670399 into lp:software-properties

[Scott Moser]

=== modified file 'debian/tests/control'
--- debian/tests/control	2016-09-01 10:23:19 +0000
+++ debian/tests/control	2017-03-06 17:11:16 +0000
@@ -1,5 +1,5 @@
 Tests: run-tests
-Depends: @, xvfb, dbus-x11, python-dbus, python-pycurl, python3-pycurl, python-mock, python3-mock, python-distutils-extra, python-setuptools, python3-distutils-extra, python3-setuptools, python-gi, python3-gi, pyflakes, pyflakes3
+Depends: @, xvfb, dbus-x11, python-dbus, python-pycurl, python3-pycurl, python-mock, python3-mock, python-distutils-extra, python-setuptools, python3-distutils-extra, python3-setuptools, python-gi, python3-gi, pyflakes, pyflakes3, gnupg
 
 Tests: add-apt-repository
 Depends: software-properties-common, gnupg

=== modified file 'debian/tests/run-tests'
--- debian/tests/run-tests	2016-09-12 11:49:08 +0000
+++ debian/tests/run-tests	2017-03-06 17:11:16 +0000
@@ -14,9 +14,13 @@
 export LC_ALL=C.UTF-8
 
 # 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
+# places should be properly declaring homedir, instead of just keyrings
+if ! out=$(gpg --list-keys 2>&1); then
+    ret=$?
+    echo "Failed [$ret] to initialize ~/.gnupg with: gpg --list-keys" 1>&2
+    echo "$out" 1>&2;
+    exit $ret
+fi
 
 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-06 17:11:16 +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)