Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixed failed tests] Decrease reconnect timeout and ensure the same data #637

Merged
merged 1 commit into from
Apr 19, 2018
Merged

[Fixed failed tests] Decrease reconnect timeout and ensure the same data #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions plenum/test/instances/test_instance_cannot_become_active_with_less_than_four_servers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions plenum/test/monitoring/test_post_monitoring_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down