diff options
Diffstat (limited to 'cpp/test/IceStorm/single/run.py')
| -rwxr-xr-x | cpp/test/IceStorm/single/run.py | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index c659a95c692..97b30f76fb3 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -45,7 +45,10 @@ print "ok" print "creating topic...", command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "create single"' iceStormAdminPipe = os.popen(command) -iceStormAdminPipe.close() +iceStormAdminStatus = iceStormAdminPipe.close() +if iceStormAdminStatus: + TestUtil.killServers() + sys.exit(1) print "ok" publisher = os.path.join(testdir, "publisher") @@ -109,7 +112,10 @@ print "ok" print "destroying topic...", command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "destroy single"' iceStormAdminPipe = os.popen(command) -iceStormAdminPipe.close() +iceStormAdminStatus = iceStormAdminPipe.close() +if iceStormAdminStatus: + TestUtil.killServers() + sys.exit(1) print "ok" # @@ -118,5 +124,18 @@ print "ok" print "shutting down icestorm...", command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "shutdown"' iceStormAdminPipe = os.popen(command) -iceStormAdminPipe.close() +iceStormAdminStatus = iceStormAdminPipe.close() +if iceStormAdminStatus: + TestUtil.killServers() + sys.exit(1) print "ok" + +iceStormStatus = iceStormPipe.close() +subscriberStatus = subscriberPipe.close() +publisherStatus = publisherPipe.close() + +if iceStormStatus or subscriberStatus or publisherStatus: + TestUtil.killServers() + sys.exit(1) + +sys.exit(0) |