diff options
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 | 24 |
1 files changed, 12 insertions, 12 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 7738c72d8..1492d479d 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!@PYTHON@ | 1 | #!/usr/bin/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 Christian Grothoff (and other contributing authors) |
4 | # | 4 | # |
@@ -68,7 +68,7 @@ def success_cont (check): | |||
68 | def fail_cont (check): | 68 | def fail_cont (check): |
69 | global success | 69 | global success |
70 | success = False; | 70 | success = False; |
71 | check.eval(True) | 71 | check.evaluate(True) |
72 | 72 | ||
73 | def check (): | 73 | def check (): |
74 | check = Check (test) | 74 | check = Check (test) |
@@ -103,13 +103,13 @@ def run (): | |||
103 | server = Peer(test, './confs/c_bootstrap_server.conf'); | 103 | server = Peer(test, './confs/c_bootstrap_server.conf'); |
104 | client = Peer(test, './confs/c_no_nat_client.conf'); | 104 | client = Peer(test, './confs/c_no_nat_client.conf'); |
105 | 105 | ||
106 | server.start(); | 106 | assert (True == server.start()); |
107 | client.start(); | 107 | assert (True == client.start()); |
108 | 108 | ||
109 | if ((client.started == True) and (server.started == True)): | 109 | if ((client.started == True) and (server.started == True)): |
110 | test.p ('Peers started, running check') | 110 | test.p ('Peers started, running check') |
111 | time.sleep(5) | 111 | time.sleep(5) |
112 | check () | 112 | check () |
113 | server.stop () | 113 | server.stop () |
114 | client.stop () | 114 | client.stop () |
115 | 115 | ||
@@ -122,12 +122,12 @@ def run (): | |||
122 | return True | 122 | return True |
123 | 123 | ||
124 | try: | 124 | try: |
125 | run () | 125 | run () |
126 | except (KeyboardInterrupt, SystemExit): | 126 | except (KeyboardInterrupt, SystemExit): |
127 | print 'Test interrupted' | 127 | print 'Test interrupted' |
128 | server.stop () | 128 | server.stop () |
129 | client.stop () | 129 | client.stop () |
130 | cleanup () | 130 | cleanup () |
131 | if (success == False): | 131 | if (success == False): |
132 | sys.exit(1) | 132 | sys.exit(1) |
133 | else: | 133 | else: |