Lots of better test stuff

1 files changed, 7 insertions, 2 deletions

diff --git a/networks/hs_instance_start.py b/networks/hs_instance_start.py
index 38282de..19cb3ad 100644
--- a/networks/hs_instance_start.py
+++ b/networks/hs_instance_start.py
@@ -4,6 +4,8 @@ from chutney.TorNet import *
 from stem.control import EventType
 
 def hs_instance_start(network):
+    result = True
+
     hs_nodes = network.get("h")
     clients = network.get("c")
 
@@ -57,6 +59,9 @@ def hs_instance_start(network):
 
         for c_group in range(i + 1):
             logging.info("Testing with the %d client group" % c_group)
-            connection_test(client_groups[c_group], i + 1)
+            expected_nodes = min(c_group, i)
+            result &= connection_test(client_groups[c_group], expected_nodes)
+
+        result &= check_same_intro_points()
 
-        check_same_intro_points()
+    return result