[PATCH] test: replace $PWD with XXX in emacs & emacs-show tests
When executed command line is written to *Notmuch errors* buffer, shell-quote-argument will backslash-escape any char that is not in "POSIX filename characters" (i.e. matching "[^-0-9a-zA-Z_./\n]"). Currently in two emacs tests shell has expanded $PWD as part of emacs variable, which will later be fed to #'shell-quote-argument and finally writte to ERROR file. If $PWD contained non-POSIX filename characters, data in ERROR file will not match $PWD when later comparing in shell. Therefore, in these two particular cases the escaped $PWD is replaced with XXX in ERROR file and expected content is adjusted accordingly. --- The regexp match replaces anything non-space ([^ ]) up to the command name with XXX. As test suite generally doesn't support spaces in directry path this is fine: try ln -s notmuch not\ much; cd not\ much; make test and see what happens. test/emacs | 5 +++-- test/emacs-show | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/emacs b/test/emacs index 3b3b14d..751d34e 100755 --- a/test/emacs +++ b/test/emacs @@ -881,7 +881,8 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) (with-current-buffer \"*Notmuch errors*\" (test-output \"ERROR\")) (test-output))" -sed -i -e 's/^\[.*\]$/[XXX]/' ERROR +sed -i -e 's/^\[.*\]$/[XXX]/' \ + -e '/^command: / s|[^ ]*/notmuch_fail |XXX/notmuch_fail |' ERROR test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\ End of search results. --- @@ -889,7 +890,7 @@ $PWD/notmuch_fail exited with status 1 (see *Notmuch errors* for more details) --- [XXX] $PWD/notmuch_fail exited with status 1 -command: $PWD/notmuch_fail search --format\=sexp --format-version\=2 --sort\=newest-first tag\:inbox +command: XXX/notmuch_fail search --format\=sexp --format-version\=2 --sort\=newest-first tag\:inbox exit status: 1" test_begin_subtest "Search handles subprocess warnings" diff --git a/test/emacs-show b/test/emacs-show index fb23db4..08de108 100755 --- a/test/emacs-show +++ b/test/emacs-show @@ -181,14 +181,15 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\")) (with-current-buffer \"*Notmuch errors*\" (test-output \"ERROR\")) (test-output))" -sed -i -e 's/^\[.*\]$/[XXX]/' ERROR +sed -i -e 's/^\[.*\]$/[XXX]/' \ + -e '/^command: / s|[^ ]*/notmuch_fail |XXX/notmuch_fail |' ERROR test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\ --- This is an error (see *Notmuch errors* for more details) --- [XXX] This is an error -command: $PWD/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\' +command: XXX/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\' exit status: 1 stderr: This is an error -- 1.8.4.2
[PATCH] test: replace $PWD with XXX in emacs emacs-show tests
When executed command line is written to *Notmuch errors* buffer, shell-quote-argument will backslash-escape any char that is not in POSIX filename characters (i.e. matching [^-0-9a-zA-Z_./\n]). Currently in two emacs tests shell has expanded $PWD as part of emacs variable, which will later be fed to #'shell-quote-argument and finally writte to ERROR file. If $PWD contained non-POSIX filename characters, data in ERROR file will not match $PWD when later comparing in shell. Therefore, in these two particular cases the escaped $PWD is replaced with XXX in ERROR file and expected content is adjusted accordingly. --- The regexp match replaces anything non-space ([^ ]) up to the command name with XXX. As test suite generally doesn't support spaces in directry path this is fine: try ln -s notmuch not\ much; cd not\ much; make test and see what happens. test/emacs | 5 +++-- test/emacs-show | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/emacs b/test/emacs index 3b3b14d..751d34e 100755 --- a/test/emacs +++ b/test/emacs @@ -881,7 +881,8 @@ test_emacs (let ((notmuch-command \$PWD/notmuch_fail\)) (with-current-buffer \*Notmuch errors*\ (test-output \ERROR\)) (test-output)) -sed -i -e 's/^\[.*\]$/[XXX]/' ERROR +sed -i -e 's/^\[.*\]$/[XXX]/' \ + -e '/^command: / s|[^ ]*/notmuch_fail |XXX/notmuch_fail |' ERROR test_expect_equal $(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR) \ End of search results. --- @@ -889,7 +890,7 @@ $PWD/notmuch_fail exited with status 1 (see *Notmuch errors* for more details) --- [XXX] $PWD/notmuch_fail exited with status 1 -command: $PWD/notmuch_fail search --format\=sexp --format-version\=2 --sort\=newest-first tag\:inbox +command: XXX/notmuch_fail search --format\=sexp --format-version\=2 --sort\=newest-first tag\:inbox exit status: 1 test_begin_subtest Search handles subprocess warnings diff --git a/test/emacs-show b/test/emacs-show index fb23db4..08de108 100755 --- a/test/emacs-show +++ b/test/emacs-show @@ -181,14 +181,15 @@ test_emacs (let ((notmuch-command \$PWD/notmuch_fail\)) (with-current-buffer \*Notmuch errors*\ (test-output \ERROR\)) (test-output)) -sed -i -e 's/^\[.*\]$/[XXX]/' ERROR +sed -i -e 's/^\[.*\]$/[XXX]/' \ + -e '/^command: / s|[^ ]*/notmuch_fail |XXX/notmuch_fail |' ERROR test_expect_equal $(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR) \ --- This is an error (see *Notmuch errors* for more details) --- [XXX] This is an error -command: $PWD/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\' +command: XXX/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\' exit status: 1 stderr: This is an error -- 1.8.4.2 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
