sweep before test start

kelvich · kelvich · commit 9f48e1bf21de · 2017-11-13T00:17:07.000+03:00
diff --git a/Makefile b/Makefile
@@ -40,8 +40,14 @@ check:
 xcheck:
 	#pip install -r tests2/requirements.txt
 	docker build -t pgmmts .
+	cd tests2 && blockade destroy || true
+	cd tests2 && docker rm node1 || true
+	cd tests2 && docker rm node2 || true
+	cd tests2 && docker rm node3 || true
+	cd tests2 && docker network rm tests2_net || true
+	cd tests2 && docker network rm tests2_net || true
 	cd tests2 && blockade up
-	sleep 10 # wait for mmts init
+	sleep 15 # wait for mmts init
 	cd tests2 && python test_recovery.py || true
-	cd tests2 && blockade destroy
+	#cd tests2 && blockade destroy
 
diff --git a/tests2/test_recovery.py b/tests2/test_recovery.py
@@ -37,10 +37,12 @@ def test_1_node_disconnect(self):
         print('Node3 disconnected')
 
         print('Waiting 20s to discover failure')
-        time.sleep(20)
-        for client in self.clients:
-            agg = client.history.aggregate()
-            print(agg)
+
+        while True:
+            time.sleep(3)
+            for client in self.clients:
+                agg = client.history.aggregate()
+                print(agg)
 
 #        print('Waiting 3s to check operability')
 #        time.sleep(3)
