diff options
| author | Lucas Hoffmann <lucc@users.noreply.github.com> | 2018-08-02 07:54:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 07:54:14 +0200 |
| commit | 2c4a2ceec84991b73a9903a3638aa47ca1dc5d2b (patch) | |
| tree | 3175f965c0c9d03d9d43de2d874e443f3830d4e8 | |
| parent | 8d1ef69a6e50d3d699ca7b7240ced9e6172fa655 (diff) | |
| parent | 5e3a58dd91367cf8944c94284a546234a93723cb (diff) | |
Merge pull request #1285 from dcbaker/travis-python37
Travis python37
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | tests/crypto_test.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index d1c671e8..4af4f86b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,15 @@ cache: ccache: True -# We need a newer version of zlib to build notmuch from source as is available -# in precise. -dist: trusty +# Python 3.7 is not supported in trusty +dist: xenial python: # We can add more version strings here when we support other python # versions. - "3.5" - "3.6" + - "3.7" # We start two containers in parallel, one to check and build the docs and the # other to run the test suite. diff --git a/tests/crypto_test.py b/tests/crypto_test.py index 56cc999d..334fcd56 100644 --- a/tests/crypto_test.py +++ b/tests/crypto_test.py @@ -1,4 +1,5 @@ # Copyright (C) 2017 Lucas Hoffmann +# Copyright © 2017-2018 Dylan Baker # This file is released under the GNU GPL, version 3 or a later revision. # For further details see the COPYING file import os @@ -125,7 +126,7 @@ class TestDetachedSignatureFor(unittest.TestCase): text = f.name self.addCleanup(os.unlink, f.name) - res = subprocess.check_call(['gpg', '--verify', sig, text], + res = subprocess.check_call(['gpg2', '--verify', sig, text], stdout=DEVNULL, stderr=DEVNULL) self.assertEqual(res, 0) @@ -376,7 +377,7 @@ class TestEncrypt(unittest.TestCase): self.addCleanup(os.unlink, enc_file) dec = subprocess.check_output( - ['gpg', '--decrypt', enc_file], stderr=DEVNULL) + ['gpg2', '--decrypt', enc_file], stderr=DEVNULL) self.assertEqual(to_encrypt, dec) |