Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix some websocket test issues (#1948)

Browse source 
Co-authored-by:  Guilherme Lawless <guilherme.lawless@tecnico.ulisboa.pt>
This commit is contained in:
cryptocode 2019-05-01 23:22:47 +02:00 • committed by GitHub
commit 5ed1b011f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nano/core_test/websocket.cpp
View file

@ -154,7 +154,7 @@ TEST (websocket, confirmation)
// Unsubscribe action, expects an acknowledge but no response follows
websocket_test_call ("::1", "24078",
R"json({"action": "unsubscribe", "topic": "confirmation", "ack": true})json", true, false);
R"json({"action": "unsubscribe", "topic": "confirmation", "ack": true})json", true, true, 1s);
unsubscribe_ack_received = true;
});
client_thread_2.detach ();
@ -445,13 +445,12 @@ TEST (websocket, vote_options)
// Wait for the websocket client to receive the vote message
system.deadline_set (5s);
while (!client_thread_finished)
while (!client_thread_finished || node1->websocket_server->any_subscribers (nano::websocket::topic::vote))
{
ASSERT_NO_ERROR (system.poll ());
}
std::atomic<bool> client_thread_2_finished{ false };
ASSERT_FALSE (node1->websocket_server->any_subscribers (nano::websocket::topic::vote));
std::thread client_thread_2 ([&client_thread_2_finished]() {
auto response = websocket_test_call ("::1", "24078",
R"json({"action": "subscribe", "topic": "vote", "ack": true, "options": {"representatives": ["xrb_invalid"]}})json", true, true, 1s);