diff options
author | ng0 <ng0@infotropique.org> | 2017-11-20 09:37:47 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2018-03-03 16:44:16 +0000 |
commit | 5bc7db2923f3e9484e0107b01267ad3eb68cbcef (patch) | |
tree | f79d6a21913a981f7b85d128619b08a12e61c1ad /src/integration-tests | |
parent | 344ad160d503de7f986e3b87a4fdbb66b83e43cd (diff) | |
download | gnunet-5bc7db2923f3e9484e0107b01267ad3eb68cbcef.tar.gz gnunet-5bc7db2923f3e9484e0107b01267ad3eb68cbcef.zip |
+
Diffstat (limited to 'src/integration-tests')
-rwxr-xr-x | src/integration-tests/test_integration_clique.py.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index 33a6da693..dfad984f7 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in | |||
@@ -1,6 +1,6 @@ | |||
1 | #!@PYTHON@ | 1 | #!@PYTHON@ |
2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
3 | # (C) 2010 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) |
4 | # | 4 | # |
5 | # GNUnet is free software; you can redistribute it and/or modify | 5 | # GNUnet is free software; you can redistribute it and/or modify |
6 | # it under the terms of the GNU General Public License as published | 6 | # it under the terms of the GNU General Public License as published |
@@ -93,13 +93,13 @@ def cleanup (): | |||
93 | def success_cont (check): | 93 | def success_cont (check): |
94 | global success | 94 | global success |
95 | success = True; | 95 | success = True; |
96 | print 'Connected clique successfully' | 96 | print('Connected clique successfully') |
97 | 97 | ||
98 | def fail_cont (check): | 98 | def fail_cont (check): |
99 | global success | 99 | global success |
100 | success= False; | 100 | success= False; |
101 | check.evaluate(True) | 101 | check.evaluate(True) |
102 | print 'Failed to connect clique' | 102 | print('Failed to connect clique') |
103 | 103 | ||
104 | def check_connect (): | 104 | def check_connect (): |
105 | check = Check (test) | 105 | check = Check (test) |
@@ -136,7 +136,7 @@ def SigHandler(signum = None, frame = None): | |||
136 | global client | 136 | global client |
137 | global client_nat | 137 | global client_nat |
138 | 138 | ||
139 | print 'Test was aborted!' | 139 | print('Test was aborted!') |
140 | if (None != server): | 140 | if (None != server): |
141 | server.stop () | 141 | server.stop () |
142 | if (None != client): | 142 | if (None != client): |
@@ -162,7 +162,7 @@ def run (): | |||
162 | 162 | ||
163 | server = Peer(test, './confs/c_bootstrap_server.conf'); | 163 | server = Peer(test, './confs/c_bootstrap_server.conf'); |
164 | if (True != server.start()): | 164 | if (True != server.start()): |
165 | print 'Failed to start server' | 165 | print('Failed to start server') |
166 | if (None != server): | 166 | if (None != server): |
167 | server.stop () | 167 | server.stop () |
168 | cleanup () | 168 | cleanup () |
@@ -173,7 +173,7 @@ def run (): | |||
173 | 173 | ||
174 | client = Peer(test, './confs/c_no_nat_client.conf'); | 174 | client = Peer(test, './confs/c_no_nat_client.conf'); |
175 | if (True != client.start()): | 175 | if (True != client.start()): |
176 | print 'Failed to start client' | 176 | print('Failed to start client') |
177 | if (None != server): | 177 | if (None != server): |
178 | server.stop () | 178 | server.stop () |
179 | if (None != client): | 179 | if (None != client): |
@@ -187,7 +187,7 @@ def run (): | |||
187 | 187 | ||
188 | client_nat = Peer(test, './confs/c_nat_client.conf'); | 188 | client_nat = Peer(test, './confs/c_nat_client.conf'); |
189 | if (True != client_nat.start()): | 189 | if (True != client_nat.start()): |
190 | print 'Failed to start client_nat' | 190 | print('Failed to start client_nat') |
191 | if (None != server): | 191 | if (None != server): |
192 | server.stop () | 192 | server.stop () |
193 | if (None != client): | 193 | if (None != client): |
@@ -217,7 +217,7 @@ def run (): | |||
217 | try: | 217 | try: |
218 | run () | 218 | run () |
219 | except (KeyboardInterrupt, SystemExit): | 219 | except (KeyboardInterrupt, SystemExit): |
220 | print 'Test interrupted' | 220 | print('Test interrupted') |
221 | server.stop () | 221 | server.stop () |
222 | client.stop () | 222 | client.stop () |
223 | client_nat.stop () | 223 | client_nat.stop () |