Tests: address placement should be deterministic by default
This commit is contained in:
parent
479afa0f84
commit
c5ebddd114
1 changed files with 6 additions and 34 deletions
|
@ -15,9 +15,14 @@ class CAddrManTest : public CAddrMan
|
||||||
uint64_t state;
|
uint64_t state;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CAddrManTest()
|
CAddrManTest(bool makeDeterministic = true)
|
||||||
{
|
{
|
||||||
state = 1;
|
state = 1;
|
||||||
|
|
||||||
|
if (makeDeterministic) {
|
||||||
|
// Set addrman addr placement to be deterministic.
|
||||||
|
MakeDeterministic();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Ensure that bucket placement is always the same for testing purposes.
|
//! Ensure that bucket placement is always the same for testing purposes.
|
||||||
|
@ -79,9 +84,6 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
CNetAddr source = ResolveIP("252.2.2.2");
|
CNetAddr source = ResolveIP("252.2.2.2");
|
||||||
|
|
||||||
// Test: Does Addrman respond correctly when empty.
|
// Test: Does Addrman respond correctly when empty.
|
||||||
|
@ -131,9 +133,6 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
CNetAddr source = ResolveIP("252.2.2.2");
|
CNetAddr source = ResolveIP("252.2.2.2");
|
||||||
|
|
||||||
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
||||||
|
@ -163,9 +162,6 @@ BOOST_AUTO_TEST_CASE(addrman_select)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
CNetAddr source = ResolveIP("252.2.2.2");
|
CNetAddr source = ResolveIP("252.2.2.2");
|
||||||
|
|
||||||
// Test: Select from new with 1 addr in new.
|
// Test: Select from new with 1 addr in new.
|
||||||
|
@ -225,9 +221,6 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
CNetAddr source = ResolveIP("252.2.2.2");
|
CNetAddr source = ResolveIP("252.2.2.2");
|
||||||
|
|
||||||
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
||||||
|
@ -254,9 +247,6 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
CNetAddr source = ResolveIP("252.2.2.2");
|
CNetAddr source = ResolveIP("252.2.2.2");
|
||||||
|
|
||||||
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
||||||
|
@ -284,9 +274,6 @@ BOOST_AUTO_TEST_CASE(addrman_find)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
||||||
|
|
||||||
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
|
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
|
||||||
|
@ -320,9 +307,6 @@ BOOST_AUTO_TEST_CASE(addrman_create)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
||||||
|
|
||||||
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
|
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
|
||||||
|
@ -343,9 +327,6 @@ BOOST_AUTO_TEST_CASE(addrman_delete)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
||||||
|
|
||||||
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
|
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
|
||||||
|
@ -366,9 +347,6 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
// Test: Sanity check, GetAddr should never return anything if addrman
|
// Test: Sanity check, GetAddr should never return anything if addrman
|
||||||
// is empty.
|
// is empty.
|
||||||
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
BOOST_CHECK_EQUAL(addrman.size(), 0);
|
||||||
|
@ -430,9 +408,6 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
CAddress addr1 = CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE);
|
CAddress addr1 = CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE);
|
||||||
CAddress addr2 = CAddress(ResolveService("250.1.1.1", 9999), NODE_NONE);
|
CAddress addr2 = CAddress(ResolveService("250.1.1.1", 9999), NODE_NONE);
|
||||||
|
|
||||||
|
@ -487,9 +462,6 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
|
||||||
{
|
{
|
||||||
CAddrManTest addrman;
|
CAddrManTest addrman;
|
||||||
|
|
||||||
// Set addrman addr placement to be deterministic.
|
|
||||||
addrman.MakeDeterministic();
|
|
||||||
|
|
||||||
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
|
CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
|
||||||
CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE);
|
CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue