diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-12-09 15:19:19 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-12-09 15:19:19 +0000 |
commit | 32538d64d62d3be3e46b9cbc128d966e10f4141e (patch) | |
tree | 0a63b058e38f88ea2944446b22c26b19091bd47c /src/integration-tests | |
parent | 3edb9f0c49a95493e67549e5ccb2016782c5b17c (diff) | |
download | gnunet-32538d64d62d3be3e46b9cbc128d966e10f4141e.tar.gz gnunet-32538d64d62d3be3e46b9cbc128d966e10f4141e.zip |
added core sessions
Diffstat (limited to 'src/integration-tests')
-rwxr-xr-x | src/integration-tests/test_integration_bootstrap_and_connect.py.in | 21 |
1 files changed, 19 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 1e0533d52..d698984cd 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in | |||
@@ -48,11 +48,13 @@ timeout = 100 | |||
48 | server_transport_connected = False | 48 | server_transport_connected = False |
49 | server_topology_connected = False | 49 | server_topology_connected = False |
50 | server_core_connected = False | 50 | server_core_connected = False |
51 | server_core_session_map = False | ||
51 | server_fs_connected = False | 52 | server_fs_connected = False |
52 | 53 | ||
53 | client_transport_connected = False | 54 | client_transport_connected = False |
54 | client_topology_connected = False | 55 | client_topology_connected = False |
55 | client_core_connected = False | 56 | client_core_connected = False |
57 | client_core_session_map = False | ||
56 | client_fs_connected = False | 58 | client_fs_connected = False |
57 | 59 | ||
58 | def vprintf (msg): | 60 | def vprintf (msg): |
@@ -139,11 +141,13 @@ def check (): | |||
139 | global server_transport_connected | 141 | global server_transport_connected |
140 | global server_topology_connected | 142 | global server_topology_connected |
141 | global server_core_connected | 143 | global server_core_connected |
144 | global server_core_session_map | ||
142 | global server_fs_connected | 145 | global server_fs_connected |
143 | 146 | ||
144 | global client_transport_connected | 147 | global client_transport_connected |
145 | global client_topology_connected | 148 | global client_topology_connected |
146 | global client_core_connected | 149 | global client_core_connected |
150 | global client_core_session_map | ||
147 | global client_fs_connected | 151 | global client_fs_connected |
148 | 152 | ||
149 | count = 1 | 153 | count = 1 |
@@ -164,6 +168,14 @@ def check (): | |||
164 | if ((False == client_core_connected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'core', '# neighbour entries allocated',1))): | 168 | if ((False == client_core_connected) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'core', '# neighbour entries allocated',1))): |
165 | client_core_connected = True | 169 | client_core_connected = True |
166 | vprintf ('Client core services is connected') | 170 | vprintf ('Client core services is connected') |
171 | |||
172 | if ((False == client_core_session_map) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'core', '# entries in session map',1))): | ||
173 | client_core_session_map = True | ||
174 | vprintf ('Server core services is connected') | ||
175 | |||
176 | if ((False == server_core_session_map) and (True == check_statistics ('./confs/c_no_nat_client.conf', 'core', '# entries in session map',1))): | ||
177 | server_core_session_map = True | ||
178 | vprintf ('Client core notifies about connected') | ||
167 | 179 | ||
168 | if ((False == server_topology_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'topology', '# peers connected',1))): | 180 | if ((False == server_topology_connected) and (True == check_statistics ('./confs/c_bootstrap_server.conf', 'topology', '# peers connected',1))): |
169 | server_topology_connected = True | 181 | server_topology_connected = True |
@@ -184,13 +196,15 @@ def check (): | |||
184 | if ((True == client_transport_connected) and (True == server_transport_connected) and | 196 | if ((True == client_transport_connected) and (True == server_transport_connected) and |
185 | (True == client_topology_connected) and (True == server_topology_connected) and | 197 | (True == client_topology_connected) and (True == server_topology_connected) and |
186 | (True == client_core_connected) and (True == server_core_connected) and | 198 | (True == client_core_connected) and (True == server_core_connected) and |
199 | (True == client_core_session_map) and (True == server_core_session_map) and | ||
187 | (True == client_fs_connected) and (True == server_fs_connected)): | 200 | (True == client_fs_connected) and (True == server_fs_connected)): |
188 | success = True | 201 | success = True |
189 | break | 202 | break |
190 | print '.' | 203 | print '.', |
191 | time.sleep(1) | 204 | time.sleep(1) |
192 | count += 1 | 205 | count += 1 |
193 | if (success == False): | 206 | if (success == False): |
207 | print '' | ||
194 | if (client_transport_connected == False): | 208 | if (client_transport_connected == False): |
195 | print ('Client transport was NOT connected') | 209 | print ('Client transport was NOT connected') |
196 | if (server_transport_connected == False): | 210 | if (server_transport_connected == False): |
@@ -203,6 +217,10 @@ def check (): | |||
203 | print ('Client core was NOT connected') | 217 | print ('Client core was NOT connected') |
204 | if (server_core_connected == False): | 218 | if (server_core_connected == False): |
205 | print ('Server core was NOT connected') | 219 | print ('Server core was NOT connected') |
220 | if (server_core_session_map == False): | ||
221 | print ('Client core sessions did NOT increase') | ||
222 | if (server_core_session_map == False): | ||
223 | print ('Server core sessions did NOT increase') | ||
206 | 224 | ||
207 | # | 225 | # |
208 | # Test execution | 226 | # Test execution |
@@ -221,7 +239,6 @@ if (success == False): | |||
221 | print ('Test failed') | 239 | print ('Test failed') |
222 | exit (1) | 240 | exit (1) |
223 | else: | 241 | else: |
224 | print ('Test successful') | ||
225 | exit (0) | 242 | exit (0) |
226 | 243 | ||
227 | 244 | ||