Merge pull request #637 from anikitinDSR/failed-test

[Fixed failed tests] Decrease reconnect timeout and ensure the same data
hyperledger · Apr 19, 2018 · 6090d21 · 6090d21
2 parents 851ad6f + ce485f7
commit 6090d21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/plenum/test/instances/test_instance_cannot_become_active_with_less_than_four_servers.py b/plenum/test/instances/test_instance_cannot_become_active_with_less_than_four_servers.py
@@ -24,6 +24,17 @@
 def limitTestRunningTime():
     return 200
 
+@pytest.fixture(scope="module")
+def tconf(tconf):
+    old_timeout_restricted = tconf.RETRY_TIMEOUT_RESTRICTED
+    old_timeout_not_restricted = tconf.RETRY_TIMEOUT_NOT_RESTRICTED
+    tconf.RETRY_TIMEOUT_RESTRICTED = 2
+    tconf.RETRY_TIMEOUT_NOT_RESTRICTED = 2
+    yield tconf
+
+    tconf.RETRY_TIMEOUT_RESTRICTED = old_timeout_restricted
+    tconf.RETRY_TIMEOUT_NOT_RESTRICTED = old_timeout_not_restricted
+
 
 # noinspection PyIncorrectDocstring
 def testProtocolInstanceCannotBecomeActiveWithLessThanFourServers(

diff --git a/plenum/test/monitoring/test_post_monitoring_stats.py b/plenum/test/monitoring/test_post_monitoring_stats.py
@@ -1,3 +1,4 @@
+from plenum.test.node_catchup.helper import ensure_all_nodes_have_same_data
 from stp_core.loop.eventually import eventually
 from plenum.server.monitor import Monitor
 from plenum.test.helper import sdk_send_random_and_check
@@ -33,6 +34,7 @@ def testPostingThroughput(postingStatsEnabled,
                               sdk_pool_handle,
                               sdk_wallet_client,
                               reqCount)
+    ensure_all_nodes_have_same_data(looper, nodes=txnPoolNodeSet)
 
     for node in txnPoolNodeSet:
         assert len(node.monitor.orderedRequestsInLast) == reqCount