From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
Date: Tue, 10 May 2011 03:30:50 +0000 (+0400)
Subject: test: copy files in test_expect_equal_file instead of moving them
X-Git-Tag: debian/0.6_254~87
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59a9c36316293b161528097a73c72d5f5ed58781;p=notmuch.git

test: copy files in test_expect_equal_file instead of moving them

Before the change, test_expect_equal_file moved files it compared
in case of failure.  The patch changes it to copy the files
instead.  This allows testing non-temporary files which are
stored in git.

Note: the change should not result in new temporary files left
after the tests.  Test_expect_equal_file used to move files only
on failure, so callers had to cleanup them anyway.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 922b1ef5..78556092 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -477,8 +477,8 @@ test_expect_equal_file ()
 			test_ok_ "$test_subtest_name"
 		else
 			testname=$this_test.$test_count
-			mv "$output" $testname.output
-			mv "$expected" $testname.expected
+			cp "$output" $testname.output
+			cp "$expected" $testname.expected
 			test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)"
 		fi
     fi