diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-17 09:36:58 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-17 09:36:58 +0000 |
commit | ff92e76e780b33c64f2638086788c60282d962b2 (patch) | |
tree | 3529558727cafb686356b8e33268e6b55ac8e55a /src/integration-tests/test_integration_bootstrap_and_connect.py.in | |
parent | 19f450a975cf83aa553f8f20f969e7b3e800aadb (diff) | |
download | gnunet-ff92e76e780b33c64f2638086788c60282d962b2.tar.gz gnunet-ff92e76e780b33c64f2638086788c60282d962b2.zip |
if start fails, clean up and exit
Diffstat (limited to 'src/integration-tests/test_integration_bootstrap_and_connect.py.in')
-rwxr-xr-x | src/integration-tests/test_integration_bootstrap_and_connect.py.in | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index afc55ca40..cb0359e1f 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in | |||
@@ -144,8 +144,22 @@ def run (): | |||
144 | server = Peer(test, './confs/c_bootstrap_server.conf'); | 144 | server = Peer(test, './confs/c_bootstrap_server.conf'); |
145 | client = Peer(test, './confs/c_no_nat_client.conf'); | 145 | client = Peer(test, './confs/c_no_nat_client.conf'); |
146 | 146 | ||
147 | assert (True == server.start()); | 147 | if (True != server.start()): |
148 | assert (True == client.start()); | 148 | print 'Failed to start server' |
149 | if (None != server): | ||
150 | server.stop () | ||
151 | if (None != server): | ||
152 | client.stop () | ||
153 | cleanup () | ||
154 | sys.exit(success) | ||
155 | if (True != client.start()): | ||
156 | print 'Failed to start client' | ||
157 | if (None != server): | ||
158 | server.stop () | ||
159 | if (None != server): | ||
160 | client.stop () | ||
161 | cleanup () | ||
162 | sys.exit(success) | ||
149 | 163 | ||
150 | if ((client.started == True) and (server.started == True)): | 164 | if ((client.started == True) and (server.started == True)): |
151 | test.p ('Peers started, running check') | 165 | test.p ('Peers started, running check') |