[PATCH] test: replace $PWD with XXX in emacs & emacs-show tests

diff --git a/13/a9ade01b40bfd9134019eafa8cfcaa57ac7492 b/13/a9ade01b40bfd9134019eafa8cfcaa57ac7492
new file mode 100644 (file)
index 0000000..ac2ca34
--- /dev/null
+++ b/13/a9ade01b40bfd9134019eafa8cfcaa57ac7492
@@ -0,0 +1,115 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id C7A0F431FDB\r
+       for <notmuch@notmuchmail.org>; Fri, 22 Nov 2013 13:06:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id A5MIUgzbD104 for <notmuch@notmuchmail.org>;\r
+       Fri, 22 Nov 2013 13:06:40 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7EC5A431FCB\r
+       for <notmuch@notmuchmail.org>; Fri, 22 Nov 2013 13:06:40 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 0557B1000D0; Fri, 22 Nov 2013 23:06:30 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: replace $PWD with XXX in emacs & emacs-show tests\r
+Date: Fri, 22 Nov 2013 23:06:29 +0200\r
+Message-Id: <1385154389-3243-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 22 Nov 2013 21:06:46 -0000\r
+\r
+When executed command line is written to *Notmuch errors* buffer,\r
+shell-quote-argument will backslash-escape any char that is not in\r
+"POSIX filename characters" (i.e. matching "[^-0-9a-zA-Z_./\n]").\r
+\r
+Currently in two emacs tests shell has expanded $PWD as part of\r
+emacs variable, which will later be fed to #'shell-quote-argument\r
+and finally writte to ERROR file. If $PWD contained non-POSIX\r
+filename characters, data in ERROR file will not match $PWD when\r
+later comparing in shell. Therefore, in these two particular cases\r
+the escaped $PWD is replaced with XXX in ERROR file and expected\r
+content is adjusted accordingly.\r
+---\r
+\r
+The regexp match replaces anything non-space ([^ ]) up to the command\r
+name with XXX. As test suite generally doesn't support spaces in\r
+directry path this is fine:\r
+\r
+try  ln -s notmuch not\ much; cd not\ much; make test\r
+\r
+and see what happens.\r
+\r
+ test/emacs      | 5 +++--\r
+ test/emacs-show | 5 +++--\r
+ 2 files changed, 6 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index 3b3b14d..751d34e 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -881,7 +881,8 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))\r
+              (with-current-buffer \"*Notmuch errors*\"\r
+                 (test-output \"ERROR\"))\r
+              (test-output))"\r
+-sed -i -e 's/^\[.*\]$/[XXX]/' ERROR\r
++sed -i        -e 's/^\[.*\]$/[XXX]/' \\r
++      -e '/^command: / s|[^ ]*/notmuch_fail |XXX/notmuch_fail |' ERROR\r
+ test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\\r
+ End of search results.\r
+ ---\r
+@@ -889,7 +890,7 @@ $PWD/notmuch_fail exited with status 1 (see *Notmuch errors* for more details)\r
+ ---\r
+ [XXX]\r
+ $PWD/notmuch_fail exited with status 1\r
+-command: $PWD/notmuch_fail search --format\=sexp --format-version\=2 --sort\=newest-first tag\:inbox\r
++command: XXX/notmuch_fail search --format\=sexp --format-version\=2 --sort\=newest-first tag\:inbox\r
+ exit status: 1"\r
+ \r
+ test_begin_subtest "Search handles subprocess warnings"\r
+diff --git a/test/emacs-show b/test/emacs-show\r
+index fb23db4..08de108 100755\r
+--- a/test/emacs-show\r
++++ b/test/emacs-show\r
+@@ -181,14 +181,15 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))\r
+              (with-current-buffer \"*Notmuch errors*\"\r
+                 (test-output \"ERROR\"))\r
+              (test-output))"\r
+-sed -i -e 's/^\[.*\]$/[XXX]/' ERROR\r
++sed -i        -e 's/^\[.*\]$/[XXX]/' \\r
++      -e '/^command: / s|[^ ]*/notmuch_fail |XXX/notmuch_fail |' ERROR\r
+ test_expect_equal "$(cat OUTPUT; echo ---; cat MESSAGES; echo ---; cat ERROR)" "\\r
+ ---\r
+ This is an error (see *Notmuch errors* for more details)\r
+ ---\r
+ [XXX]\r
+ This is an error\r
+-command: $PWD/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\'\r
++command: XXX/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\'\r
+ exit status: 1\r
+ stderr:\r
+ This is an error\r
+-- \r
+1.8.4.2\r
+\r