summaryrefslogtreecommitdiff
path: root/tests/unittests
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-06-06 15:48:25 +0200
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-06-06 15:48:25 +0200
commitbb0bf81cb373fde0c59464127633ebc7527f2be5 (patch)
treefd3ffabb1403986bc6f9c1b986112d892f013a19 /tests/unittests
parent71ea8d200da164df6f5e28d28aea424b57fd8f1f (diff)
downloadvyos-cloud-init-bb0bf81cb373fde0c59464127633ebc7527f2be5.tar.gz
vyos-cloud-init-bb0bf81cb373fde0c59464127633ebc7527f2be5.zip
capture output of gpg calls to avoid messing up stdout/stderr
Diffstat (limited to 'tests/unittests')
-rw-r--r--tests/unittests/test_handler/test_handler_apt_source.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unittests/test_handler/test_handler_apt_source.py b/tests/unittests/test_handler/test_handler_apt_source.py
index 9aa6ff71..ea8aa17a 100644
--- a/tests/unittests/test_handler/test_handler_apt_source.py
+++ b/tests/unittests/test_handler/test_handler_apt_source.py
@@ -469,7 +469,8 @@ class TestAptSourceConfig(TestCase):
testsock.close()
except socket.error:
# as fallback add the known key as a working recv would
- util.subp(("gpg", "--import", "-"), EXPECTEDKEY)
+ util.subp(("gpg", "--import", "-"), EXPECTEDKEY,
+ capture=True)
with mock.patch.object(cc_apt_configure, 'add_apt_key_raw') as mockkey:
with mock.patch.object(util, 'gpg_recv_key',