diff options
| author | David Bremner <david@tethera.net> | 2014-10-25 11:38:18 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2014-10-25 11:38:18 +0200 |
| commit | ce44657c9e4919b1e4bbbbbe37dbd72257d40736 (patch) | |
| tree | a3c1c9ff424ef6ca3acda3efcbbd6d600056ec9e /test | |
| parent | 38240d106139da8324c2a858fa3102d58378b09a (diff) | |
| parent | 26e857b7126b1963fe44801f235aa7764fdffed7 (diff) | |
Merge tag '0.18.2_rc1'
notmuch 0.18.2~rc1 release
Conflicts:
NEWS
debian/changelog
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T310-emacs.sh | 6 | ||||
| -rwxr-xr-x | test/T450-emacs-show.sh | 3 | ||||
| -rw-r--r-- | test/test-lib.sh | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh index c3024021..d72799b4 100755 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@ -877,7 +877,8 @@ exit 1 EOF chmod a+x notmuch_fail test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) - (with-current-buffer \"*Messages*\" (erase-buffer)) + (with-current-buffer \"*Messages*\" + (let ((inhibit-read-only t)) (erase-buffer))) (with-current-buffer (get-buffer-create \"*Notmuch errors*\") (erase-buffer)) (notmuch-search \"tag:inbox\") @@ -909,7 +910,8 @@ exit 0 EOF chmod a+x notmuch_fail test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) - (with-current-buffer \"*Messages*\" (erase-buffer)) + (with-current-buffer \"*Messages*\" + (let ((inhibit-read-only t)) (erase-buffer))) (with-current-buffer (get-buffer-create \"*Notmuch errors*\") (erase-buffer)) (notmuch-search \"tag:inbox\") diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh index 2a3a5356..bfcd5efe 100755 --- a/test/T450-emacs-show.sh +++ b/test/T450-emacs-show.sh @@ -173,7 +173,8 @@ exit 1 EOF chmod a+x notmuch_fail test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) - (with-current-buffer \"*Messages*\" (erase-buffer)) + (with-current-buffer \"*Messages*\" + (let ((inhibit-read-only t)) (erase-buffer))) (condition-case err (notmuch-show \"*\") (error (message \"%s\" (second err)))) diff --git a/test/test-lib.sh b/test/test-lib.sh index b9b8fe8c..53db9caa 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -690,6 +690,7 @@ notmuch_json_show_sanitize () sed \ -e 's|"id": "[^"]*",|"id": "XXXXX",|g' \ -e 's|"Date": "Fri, 05 Jan 2001 [^"]*0000"|"Date": "GENERATED_DATE"|g' \ + -e 's|"filename": "signature.asc",||g' \ -e 's|"filename": "/[^"]*",|"filename": "YYYYY",|g' \ -e 's|"timestamp": 97.......|"timestamp": 42|g' } |