eliminate check for dead statistic in integration tests

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 0a16237c0a001e31a5e08076e7eaa7a30259d1ec..01e36f81cf0e40672ea0f8972dca2a96cff20d75 100755 (executable)
--- 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):
 def check ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
-  check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
   check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'dht', '# peers connected',1))  
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
-  check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
   check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   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 dfad984f7b02e946848f908aa4eff0a631a658a1..f8b60f33d7fd4a3acccf10cfc5d5d63fccc57760 100755 (executable)
--- 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):
 def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',2))
-  check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',2))  
   check.add (StatisticsCondition (client, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client, 'dht', '# peers connected',2))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',2))
 
   check.add (StatisticsCondition (client_nat, 'transport', '# peers connected',2))
-  check.add (StatisticsCondition (client_nat, 'core', '# neighbour entries allocated',2))  
   check.add (StatisticsCondition (client_nat, 'core', '# peers connected',2))
   check.add (StatisticsCondition (client_nat, 'topology', '# peers connected',2))
   check.add (StatisticsCondition (client_nat, 'dht', '# peers connected',2))
   check.add (StatisticsCondition (client_nat, 'fs', '# peers connected',2))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',2))
-  check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',2))  
   check.add (StatisticsCondition (server, 'core', '# peers connected',2))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',2))
   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 de9d6782311eac3dd231223587fc29394befc0a3..8ab3ff4366507bee5a76039b1f99708f824ede24 100755 (executable)
--- 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 ():
   server.stop ()
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',0))
-  check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0))  
   check.add (StatisticsCondition (client, 'core', '# peers connected',0))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',0))
   check.add (StatisticsCondition (client, 'dht', '# peers connected',0))
@@ -109,14 +108,12 @@ def fail_connect_cont (check):
 def check_connect ():
   check = Check (test)
   check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
-  check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
   check.add (StatisticsCondition (client, 'core', '# peers connected',1))
   check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
   check.add (StatisticsCondition (client, 'dht', '# peers connected',1))
   check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
   
   check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
-  check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
   check.add (StatisticsCondition (server, 'core', '# peers connected',1))
   check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
   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 d8c865147b13ee1e25dc92853269889193eacc59..bc86ef3f31db3926d5724f7a041e493589303db1 100755 (executable)
--- 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):
        
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
-       check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
        check.add (StatisticsCondition (client, 'core', '# peers connected',1))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
        
        check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
-       check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
        check.add (StatisticsCondition (server, 'core', '# peers connected',1))
        check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
@@ -139,13 +137,11 @@ def fail_connect_cont (check):
 def check_connect ():
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
-       check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
        check.add (StatisticsCondition (client, 'core', '# peers connected',1))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
        
        check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
-       check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
        check.add (StatisticsCondition (server, 'core', '# peers connected',1))
        check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
        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 b6246d444e11c49c891b788a4f545c7e029aa31e..78c75c335c57121458947fbadca4ee6104b63763 100755 (executable)
--- 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):
        
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
-       check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
        check.add (StatisticsCondition (client, 'core', '# peers connected',1))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
        
        check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
-       check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
        check.add (StatisticsCondition (server, 'core', '# peers connected',1))
        check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (server, 'fs', '# peers connected',1))  
@@ -139,13 +137,11 @@ def fail_connect_cont (check):
 def check_connect ():
        check = Check (test)
        check.add (StatisticsCondition (client, 'transport', '# peers connected',1))
-       check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1))  
        check.add (StatisticsCondition (client, 'core', '# peers connected',1))
        check.add (StatisticsCondition (client, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (client, 'fs', '# peers connected',1))
        
        check.add (StatisticsCondition (server, 'transport', '# peers connected',1))
-       check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1))  
        check.add (StatisticsCondition (server, 'core', '# peers connected',1))
        check.add (StatisticsCondition (server, 'topology', '# peers connected',1))
        check.add (StatisticsCondition (server, 'fs', '# peers connected',1))