aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-03-30 16:36:51 +0200
committerChristian Grothoff <christian@grothoff.org>2018-03-30 16:36:51 +0200
commit064800aedb6c049a59734222756c0622a02cdc67 (patch)
tree64782c2fbf4b18c0c5fa738c290331f1df211bf3 /src/integration-tests
parentb7513a90c350bc3f768c3b1e7a42228f272314dd (diff)
downloadgnunet-064800aedb6c049a59734222756c0622a02cdc67.tar.gz
gnunet-064800aedb6c049a59734222756c0622a02cdc67.zip
eliminate check for dead statistic in integration tests
Diffstat (limited to 'src/integration-tests')
-rwxr-xr-xsrc/integration-tests/test_integration_bootstrap_and_connect.py.in2
-rwxr-xr-xsrc/integration-tests/test_integration_clique.py.in3
-rwxr-xr-xsrc/integration-tests/test_integration_disconnect.py.in3
-rwxr-xr-xsrc/integration-tests/test_integration_reconnect.py.in4
-rwxr-xr-xsrc/integration-tests/test_integration_reconnect_nat.py.in4
5 files changed, 0 insertions, 16 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 0a16237c0..01e36f81c 100755
--- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in
+++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in
@@ -106,14 +106,12 @@ def fail_cont (check):
106def check (): 106def check ():
107 check = Check (test) 107 check = Check (test)
108 check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) 108 check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
109 check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))
110 check.add (StatisticsCondition (client, 'core', '# peers connected',1)) 109 check.add (StatisticsCondition (client, 'core', '# peers connected',1))
111 check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) 110 check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
112 check.add (StatisticsCondition (client, 'dht', '# peers connected',1)) 111 check.add (StatisticsCondition (client, 'dht', '# peers connected',1))
113 check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) 112 check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
114 113
115 check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) 114 check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
116 check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))
117 check.add (StatisticsCondition (server, 'core', '# peers connected',1)) 115 check.add (StatisticsCondition (server, 'core', '# peers connected',1))
118 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 116 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
119 check.add (StatisticsCondition (server, 'dht', '# peers connected',1)) 117 check.add (StatisticsCondition (server, 'dht', '# peers connected',1))
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in
index dfad984f7..f8b60f33d 100755
--- a/src/integration-tests/test_integration_clique.py.in
+++ b/src/integration-tests/test_integration_clique.py.in
@@ -104,21 +104,18 @@ def fail_cont (check):
104def check_connect (): 104def check_connect ():
105 check = Check (test) 105 check = Check (test)
106 check.add (StatisticsCondition (client, 'transport', '# peers connected',2)) 106 check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
107 check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))
108 check.add (StatisticsCondition (client, 'core', '# peers connected',2)) 107 check.add (StatisticsCondition (client, 'core', '# peers connected',2))
109 check.add (StatisticsCondition (client, 'topology', '# peers connected',2)) 108 check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
110 check.add (StatisticsCondition (client, 'dht', '# peers connected',2)) 109 check.add (StatisticsCondition (client, 'dht', '# peers connected',2))
111 check.add (StatisticsCondition (client, 'fs', '# peers connected',2)) 110 check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
112 111
113 check.add (StatisticsCondition (client_nat, 'transport', '# peers connected',2)) 112 check.add (StatisticsCondition (client_nat, 'transport', '# peers connected',2))
114 check.add (StatisticsCondition (client_nat, 'core', '# neighbour entries allocated',2))
115 check.add (StatisticsCondition (client_nat, 'core', '# peers connected',2)) 113 check.add (StatisticsCondition (client_nat, 'core', '# peers connected',2))
116 check.add (StatisticsCondition (client_nat, 'topology', '# peers connected',2)) 114 check.add (StatisticsCondition (client_nat, 'topology', '# peers connected',2))
117 check.add (StatisticsCondition (client_nat, 'dht', '# peers connected',2)) 115 check.add (StatisticsCondition (client_nat, 'dht', '# peers connected',2))
118 check.add (StatisticsCondition (client_nat, 'fs', '# peers connected',2)) 116 check.add (StatisticsCondition (client_nat, 'fs', '# peers connected',2))
119 117
120 check.add (StatisticsCondition (server, 'transport', '# peers connected',2)) 118 check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
121 check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))
122 check.add (StatisticsCondition (server, 'core', '# peers connected',2)) 119 check.add (StatisticsCondition (server, 'core', '# peers connected',2))
123 check.add (StatisticsCondition (server, 'topology', '# peers connected',2)) 120 check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
124 check.add (StatisticsCondition (server, 'dht', '# peers connected',2)) 121 check.add (StatisticsCondition (server, 'dht', '# peers connected',2))
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in
index de9d67823..8ab3ff436 100755
--- a/src/integration-tests/test_integration_disconnect.py.in
+++ b/src/integration-tests/test_integration_disconnect.py.in
@@ -86,7 +86,6 @@ def check_disconnect ():
86 server.stop () 86 server.stop ()
87 check = Check (test) 87 check = Check (test)
88 check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) 88 check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
89 check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))
90 check.add (StatisticsCondition (client, 'core', '# peers connected',0)) 89 check.add (StatisticsCondition (client, 'core', '# peers connected',0))
91 check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) 90 check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
92 check.add (StatisticsCondition (client, 'dht', '# peers connected',0)) 91 check.add (StatisticsCondition (client, 'dht', '# peers connected',0))
@@ -109,14 +108,12 @@ def fail_connect_cont (check):
109def check_connect (): 108def check_connect ():
110 check = Check (test) 109 check = Check (test)
111 check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) 110 check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
112 check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))
113 check.add (StatisticsCondition (client, 'core', '# peers connected',1)) 111 check.add (StatisticsCondition (client, 'core', '# peers connected',1))
114 check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) 112 check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
115 check.add (StatisticsCondition (client, 'dht', '# peers connected',1)) 113 check.add (StatisticsCondition (client, 'dht', '# peers connected',1))
116 check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) 114 check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
117 115
118 check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) 116 check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
119 check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))
120 check.add (StatisticsCondition (server, 'core', '# peers connected',1)) 117 check.add (StatisticsCondition (server, 'core', '# peers connected',1))
121 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 118 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
122 check.add (StatisticsCondition (server, 'dht', '# peers connected',1)) 119 check.add (StatisticsCondition (server, 'dht', '# peers connected',1))
diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in
index d8c865147..bc86ef3f3 100755
--- a/src/integration-tests/test_integration_reconnect.py.in
+++ b/src/integration-tests/test_integration_reconnect.py.in
@@ -115,13 +115,11 @@ def success_connect_cont (check):
115 115
116 check = Check (test) 116 check = Check (test)
117 check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) 117 check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
118 check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))
119 check.add (StatisticsCondition (client, 'core', '# peers connected',1)) 118 check.add (StatisticsCondition (client, 'core', '# peers connected',1))
120 check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) 119 check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
121 check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) 120 check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
122 121
123 check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) 122 check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
124 check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))
125 check.add (StatisticsCondition (server, 'core', '# peers connected',1)) 123 check.add (StatisticsCondition (server, 'core', '# peers connected',1))
126 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 124 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
127 check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) 125 check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
@@ -139,13 +137,11 @@ def fail_connect_cont (check):
139def check_connect (): 137def check_connect ():
140 check = Check (test) 138 check = Check (test)
141 check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) 139 check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
142 check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))
143 check.add (StatisticsCondition (client, 'core', '# peers connected',1)) 140 check.add (StatisticsCondition (client, 'core', '# peers connected',1))
144 check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) 141 check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
145 check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) 142 check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
146 143
147 check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) 144 check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
148 check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))
149 check.add (StatisticsCondition (server, 'core', '# peers connected',1)) 145 check.add (StatisticsCondition (server, 'core', '# peers connected',1))
150 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 146 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
151 check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) 147 check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in
index b6246d444..78c75c335 100755
--- a/src/integration-tests/test_integration_reconnect_nat.py.in
+++ b/src/integration-tests/test_integration_reconnect_nat.py.in
@@ -115,13 +115,11 @@ def success_connect_cont (check):
115 115
116 check = Check (test) 116 check = Check (test)
117 check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) 117 check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
118 check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))
119 check.add (StatisticsCondition (client, 'core', '# peers connected',1)) 118 check.add (StatisticsCondition (client, 'core', '# peers connected',1))
120 check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) 119 check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
121 check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) 120 check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
122 121
123 check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) 122 check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
124 check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))
125 check.add (StatisticsCondition (server, 'core', '# peers connected',1)) 123 check.add (StatisticsCondition (server, 'core', '# peers connected',1))
126 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 124 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
127 check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) 125 check.add (StatisticsCondition (server, 'fs', '# peers connected',1))
@@ -139,13 +137,11 @@ def fail_connect_cont (check):
139def check_connect (): 137def check_connect ():
140 check = Check (test) 138 check = Check (test)
141 check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) 139 check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
142 check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))
143 check.add (StatisticsCondition (client, 'core', '# peers connected',1)) 140 check.add (StatisticsCondition (client, 'core', '# peers connected',1))
144 check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) 141 check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
145 check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) 142 check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
146 143
147 check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) 144 check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
148 check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))
149 check.add (StatisticsCondition (server, 'core', '# peers connected',1)) 145 check.add (StatisticsCondition (server, 'core', '# peers connected',1))
150 check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) 146 check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
151 check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) 147 check.add (StatisticsCondition (server, 'fs', '# peers connected',1))