From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Mon, 12 Dec 2016 13:21:53 +0000 (+0000)
Subject: mg-schema-test-database: Wrap some withtest psql_do in subshells
X-Git-Tag: openstack-v11~171
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=89e53a5d98ea10413b4994e7afac5baf74866ec1;p=people%2Faperard%2Fosstest.git

mg-schema-test-database: Wrap some withtest psql_do in subshells

Otherwise it takes effect for the rest of the script, which is not
what is wanted !  As it happens, there are no accesses to the real db
after this point, so this bug is latent.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/mg-schema-test-database b/mg-schema-test-database
index a82c044e..0517ca36 100755
--- a/mg-schema-test-database
+++ b/mg-schema-test-database
@@ -509,19 +509,20 @@ END
 	printf "borrow..."
 
 	for task in $tasks; do
-		withtest psql_do <<END
+		(withtest psql_do <<END
 			BEGIN;
 			UPDATE resources
 				SET owntaskid = $(taskid magic idle)
 				WHERE owntaskid = $(borrowtaskid $task);
 			COMMIT;
 END
+                )
 	done
-	withtest psql_do <<END
+	(withtest psql_do <<END
 		DELETE FROM tasks
 			WHERE type='xdbref' AND refkey='$dbname';
 END
-
+        )
 	printf "\n"
 
 	cat <<END