Re: [PATCH] test: clean up some extra whitespace.

2021-03-12 Thread David Bremner
David Bremner  writes:

> The extra space is mainly just untidy.

Applied to master.

d
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


[PATCH] test: clean up some extra whitespace.

2021-01-15 Thread David Bremner
The extra space is mainly just untidy.
---
 test/T030-config.sh   |  2 +-
 test/T050-new.sh  |  8 
 test/T070-insert.sh   |  4 ++--
 test/T140-excludes.sh |  2 +-
 test/T150-tagging.sh  |  6 +++---
 test/T210-raw.sh  |  2 +-
 test/T230-reply-to-sender.sh  | 20 ++--
 test/T240-dump-restore.sh |  4 ++--
 test/T340-maildir-sync.sh |  2 +-
 test/T410-argument-parsing.sh |  2 +-
 test/T480-hex-escaping.sh |  8 
 test/T510-thread-replies.sh   |  2 +-
 test/T562-lib-database.sh | 10 +-
 test/T566-lib-message.sh  | 16 
 test/T700-reindex.sh  |  4 ++--
 test/T750-gzip.sh |  2 +-
 16 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/test/T030-config.sh b/test/T030-config.sh
index 883541d5..32efa945 100755
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -76,7 +76,7 @@ test_expect_equal "$(notmuch --config:alt-config config get 
user.name)" \
 "Another Name"
 
 test_begin_subtest "Top level --configFILE option"
-test_expect_equal "$(notmuch --config  alt-config config get user.name)" \
+test_expect_equal "$(notmuch --config alt-config config get user.name)" \
 "Another Name"
 
 test_begin_subtest "Top level --config=FILE option changed the right file"
diff --git a/test/T050-new.sh b/test/T050-new.sh
index 009b2633..1aa26242 100755
--- a/test/T050-new.sh
+++ b/test/T050-new.sh
@@ -341,9 +341,9 @@ notmuch config set new.tags $OLDCONFIG
 
 
 test_begin_subtest "Xapian exception: read only files"
-chmod u-w  ${MAIL_DIR}/.notmuch/xapian/*.*
+chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
 output=$(NOTMUCH_NEW --debug 2>&1 | sed 's/: .*$//' )
-chmod u+w  ${MAIL_DIR}/.notmuch/xapian/*.*
+chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
 test_expect_equal "$output" "A Xapian exception occurred opening database"
 
 
@@ -385,8 +385,8 @@ test_begin_subtest "reference loop does not crash"
 test_expect_code 0 "notmuch show --format=json id:mid-loop...@example.org 
id:mid-loop...@example.org > OUTPUT"
 
 test_begin_subtest "reference loop ordered by date"
-threadid=$(notmuch search --output=threads  id:mid-loop...@example.org)
-notmuch show --format=mbox $threadid | grep '^Date'  > OUTPUT
+threadid=$(notmuch search --output=threads id:mid-loop...@example.org)
+notmuch show --format=mbox $threadid | grep '^Date' > OUTPUT
 cat < EXPECTED
 Date: Thu, 16 Jun 2016 22:14:41 -0400
 Date: Fri, 17 Jun 2016 22:14:41 -0400
diff --git a/test/T070-insert.sh b/test/T070-insert.sh
index 1c7ca846..161ca237 100755
--- a/test/T070-insert.sh
+++ b/test/T070-insert.sh
@@ -245,7 +245,7 @@ notmuch config set new.tags $OLDCONFIG
 
 # DUPLICATE_MESSAGE_ID is not tested here, because it should actually pass.
 # pregenerate all of the test shims
-for code in  FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR 
OUT_OF_MEMORY XAPIAN_EXCEPTION; do
+for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR 
OUT_OF_MEMORY XAPIAN_EXCEPTION; do
 make_shim shim-$code <
 #include 
@@ -262,7 +262,7 @@ done
 
 gen_insert_msg
 
-for code in  FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do
+for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do
 test_begin_subtest "EXIT_FAILURE when index_file returns $code"
 test_expect_code 1 "notmuch_with_shim shim-$code insert < 
\"$gen_msg_filename\""
 
diff --git a/test/T140-excludes.sh b/test/T140-excludes.sh
index cef07095..e4fe4cd1 100755
--- a/test/T140-excludes.sh
+++ b/test/T140-excludes.sh
@@ -374,7 +374,7 @@ Subject: No messages excluded: single match: reply 4
 Subject: No messages excluded: single match: reply 5"
 
 test_begin_subtest "Show, exclude=false"
-output=$(notmuch show --exclude=false tag:test | notmuch_show_sanitize_all  | 
egrep "Subject:|message{")
+output=$(notmuch show --exclude=false tag:test | notmuch_show_sanitize_all | 
egrep "Subject:|message{")
 test_expect_equal "$output" "message{ id:X depth:0 match:1 excluded:1 
filename:X
 Subject: All messages excluded: single match: reply 2
 message{ id:X depth:0 match:1 excluded:1 filename:X
diff --git a/test/T150-tagging.sh b/test/T150-tagging.sh
index 2f0b3531..c292b24e 100755
--- a/test/T150-tagging.sh
+++ b/test/T150-tagging.sh
@@ -90,7 +90,7 @@ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox 
tag5 unread)
 thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag5 unread)"
 
 # generate a common input file for the next several tests.
-cat > batch.in  < batch.in <&1 | sed 's/: .*$//' )
-chmod u+w  ${MAIL_DIR}/.notmuch/xapian/*.*
+chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
 test_expect_equal "$output" "A Xapian exception occurred opening database"
 
 test_done
diff --git a/test/T210-raw.sh b/test/T210-raw.sh
index 9a8b990c..e1d50bf9 100755
--- a/test/T210-raw.sh
+++ b/test/T210-raw.sh
@@ -61,7 +61,7 @@ for pow in {10..20}; do
 notmuch show --format=raw subject:$size >