All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 2/9] mg-schema-test-database: Wrap some withtest psql_do in subshells
Date: Tue, 20 Dec 2016 18:37:55 +0000	[thread overview]
Message-ID: <1482259082-30767-3-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1482259082-30767-1-git-send-email-ian.jackson@eu.citrix.com>

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>
---
 mg-schema-test-database | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mg-schema-test-database b/mg-schema-test-database
index a82c044..0517ca3 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
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

  parent reply	other threads:[~2016-12-20 18:47 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-20 18:37 [OSSTEST PATCH 0/9] db retry: fixes and workarounds Ian Jackson
2016-12-20 18:37 ` [OSSTEST PATCH 1/9] mg-schema-test-database: Revamp sequence handling Ian Jackson
2016-12-20 18:37 ` Ian Jackson [this message]
2016-12-20 18:37 ` [OSSTEST PATCH 3/9] cs-bisection-step: Do not acquire the repo lock Ian Jackson
2016-12-20 18:37 ` [OSSTEST PATCH 4/9] db retry, bisection: Reset %jobs_created on db retry Ian Jackson
2016-12-20 18:37 ` [OSSTEST PATCH 5/9] db retry, bisect: Cache build reuse investigations Ian Jackson
2016-12-20 18:37 ` [OSSTEST PATCH 6/9] db retry: Document $@ as an implicit parameter to need_retry Ian Jackson
2016-12-20 18:38 ` [OSSTEST PATCH 7/9] db retry: Break out Osstest::Executive::JobDB::_need_retry Ian Jackson
2016-12-20 18:38 ` [OSSTEST PATCH 8/9] db retry: Use HandleError and exceptions to detect when to retry Ian Jackson
2016-12-20 18:38 ` [OSSTEST PATCH 9/9] db retry: Retry on $dbh->state eq '' Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1482259082-30767-3-git-send-email-ian.jackson@eu.citrix.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.