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

@@ -40,7 +40,9 @@ my %port_for = (
slave2 => 2903,
);
foreach my $port ( values %port_for ) {
diag(`$trunk/sandbox/stop-sandbox remove $port >/dev/null`);
if ( -d "/tmp/$port" ) {
diag(`$trunk/sandbox/stop-sandbox $port >/dev/null`);
}
}
diag(`$trunk/sandbox/start-sandbox master 2900 >/dev/null`);
diag(`$trunk/sandbox/start-sandbox slave 2903 2900 >/dev/null`);
@@ -464,5 +466,5 @@ ok(
# #############################################################################
# Done.
# #############################################################################
diag(`$trunk/sandbox/stop-sandbox remove 2903 2902 2901 2900 >/dev/null`);
diag(`$trunk/sandbox/stop-sandbox 2903 2902 2901 2900 >/dev/null`);
exit;