Whisper test fix.

This commit is contained in:
Gav Wood 2014-12-11 22:52:20 +01:00
parent 6e390ba059
commit 98722ae8e8

View File

@ -32,7 +32,7 @@ BOOST_AUTO_TEST_SUITE(whisper)
BOOST_AUTO_TEST_CASE(topic) BOOST_AUTO_TEST_CASE(topic)
{ {
g_logVerbosity = 0; g_logVerbosity = 20;
bool started = false; bool started = false;
unsigned result = 0; unsigned result = 0;
@ -40,16 +40,16 @@ BOOST_AUTO_TEST_CASE(topic)
{ {
setThreadName("other"); setThreadName("other");
Host ph("Test", NetworkPreferences(30303, "", false, true)); Host ph("Test", NetworkPreferences(50303, "", false, true));
auto wh = ph.registerCapability(new WhisperHost()); auto wh = ph.registerCapability(new WhisperHost());
ph.start(); ph.start();
started = true; started = true;
/// Only interested in odd packets /// Only interested in odd packets
auto w = wh->installWatch(BuildTopicMask()("odd")); auto w = wh->installWatch(BuildTopicMask("odd"));
for (int i = 0, last = 0; i < 100 && last < 81; ++i) for (int i = 0, last = 0; i < 200 && last < 81; ++i)
{ {
for (auto i: wh->checkWatch(w)) for (auto i: wh->checkWatch(w))
{ {
@ -65,10 +65,12 @@ BOOST_AUTO_TEST_CASE(topic)
while (!started) while (!started)
this_thread::sleep_for(chrono::milliseconds(50)); this_thread::sleep_for(chrono::milliseconds(50));
Host ph("Test", NetworkPreferences(30300, "", false, true)); Host ph("Test", NetworkPreferences(50300, "", false, true));
auto wh = ph.registerCapability(new WhisperHost()); auto wh = ph.registerCapability(new WhisperHost());
this_thread::sleep_for(chrono::milliseconds(500));
ph.start(); ph.start();
ph.connect("127.0.0.1", 30303); this_thread::sleep_for(chrono::milliseconds(500));
ph.connect("127.0.0.1", 50303);
KeyPair us = KeyPair::create(); KeyPair us = KeyPair::create();
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
@ -78,6 +80,8 @@ BOOST_AUTO_TEST_CASE(topic)
} }
listener.join(); listener.join();
g_logVerbosity = 0;
BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81); BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81);
} }