[PATCH 1/2] test: copy files in test_expect_equal_file instead of moving them

Dmitry Kurochkin dmitry.kurochkin at gmail.com
Mon May 9 20:30:50 PDT 2011


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.
---
 test/test-lib.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index eaf5051..7cc43cd 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
-- 
1.7.5.1



More information about the notmuch mailing list