From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
Date: Thu, 17 Nov 2011 13:05:56 +0000 (+0400)
Subject: test: add test state reset to test_expect_* functions that did not have it
X-Git-Tag: 0.11_rc1~92
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5aeca8182f02ca3800894ed39a6677c438ab131c;p=notmuch.git

test: add test state reset to test_expect_* functions that did not have it
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 20fa195e..076f9295 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -644,6 +644,7 @@ test_expect_success () {
 	test "$#" = 3 && { prereq=$1; shift; } || prereq=
 	test "$#" = 2 ||
 	error "bug in the test script: not 2 or 3 parameters to test-expect-success"
+	test_reset_state_
 	if ! test_skip "$@"
 	then
 		test_run_ "$2"
@@ -660,6 +661,7 @@ test_expect_code () {
 	test "$#" = 4 && { prereq=$1; shift; } || prereq=
 	test "$#" = 3 ||
 	error "bug in the test script: not 3 or 4 parameters to test-expect-code"
+	test_reset_state_
 	if ! test_skip "$@"
 	then
 		test_run_ "$3"
@@ -686,6 +688,7 @@ test_external () {
 	error >&5 "bug in the test script: not 3 or 4 parameters to test_external"
 	descr="$1"
 	shift
+	test_reset_state_
 	if ! test_skip "$descr" "$@"
 	then
 		# Announce the script to reduce confusion about the