Make sandbox scripts simpler and more reliable. Remove "remove" option from stop-sandbox and update tests that used it.

This commit is contained in:
Daniel Nichter
2011-08-23 09:11:00 -06:00
parent 4715afc7c0
commit e93381d6b6
13 changed files with 39 additions and 78 deletions

View File

@@ -17,7 +17,7 @@ use Sandbox;
require "$trunk/bin/pt-heartbeat";
diag(`$trunk/sandbox/test-env reset`); # don't repl sakila db to 12347
diag(`$trunk/sandbox/stop-sandbox remove 12347 >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox 12347 >/dev/null`);
diag(`$trunk/sandbox/start-sandbox slave 12347 12346 >/dev/null`);
my $dp = new DSNParser(opts=>$dsn_opts);
@@ -247,7 +247,7 @@ foreach my $port (@ports) {
}
diag(`rm -rf /tmp/mk-heartbeat-sentinel >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox remove 12347 >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox 12347 >/dev/null`);
# #############################################################################
# Done.