diff options
| author | David Bremner <david@tethera.net> | 2017-06-03 14:47:34 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-07-04 08:32:44 -0300 |
| commit | e1b7d32db00ea8afaa1f2ae31bdaa5cb423dda96 (patch) | |
| tree | c14dea5dda1e59dbf2f1aa55302e6f5933f3e03f /test | |
| parent | 9eacd7d367aff4c5e8069e4b9f4c7ed8f466f6ee (diff) | |
cli: implement structured output version 4
Since the error field is unused by the emacs front end, no changes are
needed other than bumping the format version number.
As it is, this is a bit overengineered, but it will reduce duplication
when we support gmime 3.0
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T350-crypto.sh | 4 | ||||
| -rwxr-xr-x | test/T355-smime.sh | 4 | ||||
| -rwxr-xr-x | test/T450-emacs-show.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh index d21cad14..0753acf3 100755 --- a/test/T350-crypto.sh +++ b/test/T350-crypto.sh @@ -123,7 +123,7 @@ expected='[[[{"id": "XXXXX", "body": [{"id": 1, "sigstatus": [{"status": "error", "keyid": "'$(echo $FINGERPRINT | cut -c 25-)'", - "errors": 2}], + "errors": {"key-missing": true}}], "content-type": "multipart/signed", "content": [{"id": 2, "content-type": "text/plain", @@ -367,7 +367,7 @@ expected='[[[{"id": "XXXXX", "body": [{"id": 1, "sigstatus": [{"status": "error", "keyid": "6D92612D94E46381", - "errors": 8}], + "errors": {"key-revoked": true}}], "content-type": "multipart/signed", "content": [{"id": 2, "content-type": "text/plain", diff --git a/test/T355-smime.sh b/test/T355-smime.sh index 0f39bc69..03d24581 100755 --- a/test/T355-smime.sh +++ b/test/T355-smime.sh @@ -64,8 +64,8 @@ expected='[[[{"id": "XXXXX", "To": "test_suite@notmuchmail.org", "Date": "Sat, 01 Jan 2000 12:00:00 +0000"}, "body": [{"id": 1, - "sigstatus": [{"status": "good", - "fingerprint": "'$FINGERPRINT'", + "sigstatus": [{"fingerprint": "'$FINGERPRINT'", + "status": "good", "expires": 424242424, "created": 946728000}], "content-type": "multipart/signed", diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh index d302efb6..c4bc5ce0 100755 --- a/test/T450-emacs-show.sh +++ b/test/T450-emacs-show.sh @@ -191,7 +191,7 @@ This is an error (see *Notmuch errors* for more details) === ERROR === [XXX] This is an error -command: YYY/notmuch_fail show --format\\=sexp --format-version\\=3 --exclude\\=false \\' \\* \\' +command: YYY/notmuch_fail show --format\\=sexp --format-version\\=4 --exclude\\=false \\' \\* \\' exit status: 1 stderr: This is an error |