From: Carl Worth <cworth@cworth.org>
Date: Thu, 15 Apr 2010 21:01:54 +0000 (-0700)
Subject: test: Remove test-message filenames from generated messages
X-Git-Tag: 0.2~41
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=9c0ae2e73e9cf705411ec26bf999a172d4e126bf

test: Remove test-message filenames from generated messages

The filenames aren't predictable (including the current directory) nor
stable from one run to the next (including the PID). This makes it
hard to predict the output from a search command that returns such a
message (such as "*").

The original goal was simply to ensure that each generated message was
distinguishable somehow. So just use the message counter instead.
---

diff --git a/test/notmuch-test b/test/notmuch-test
index e74e6e13..74509bcf 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -94,7 +94,7 @@ generate_message ()
     fi
 
     if [ -z "${template[body]}" ]; then
-	template[body]="This is just a test message at ${gen_msg_filename}"
+	template[body]="This is just test message (#${gen_msg_cnt})"
     fi
 
     if [ -z "${template[from]}" ]; then
@@ -106,7 +106,7 @@ generate_message ()
     fi
 
     if [ -z "${template[subject]}" ]; then
-	template[subject]="Test message ${gen_msg_filename}"
+	template[subject]="Test message #${gen_msg_cnt}"
     fi
 
     if [ -z "${template[date]}" ]; then