This test starts several node instances which can be slow to start, especially with TEST_USE_ROCKSDB=1. This would cause connections to be cleaned up before the substantial ASSERTs were checked. (#3336)
This adds a flag to disable connection cleanup assuming that all network connections will remain live.
This commit is contained in:
		
					parent
					
						
							
								b5c1925e29
							
						
					
				
			
			
				commit
				
					
						bdb7555f8e
					
				
			
		
					 3 changed files with 8 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -899,11 +899,11 @@ TEST (network, replace_port)
 | 
			
		|||
 | 
			
		||||
TEST (network, peer_max_tcp_attempts)
 | 
			
		||||
{
 | 
			
		||||
	nano::system system (1);
 | 
			
		||||
	auto node (system.nodes[0]);
 | 
			
		||||
	// Add nodes that can accept TCP connection, but not node ID handshake
 | 
			
		||||
	nano::node_flags node_flags;
 | 
			
		||||
	node_flags.disable_tcp_realtime = true;
 | 
			
		||||
	node_flags.disable_connection_cleanup = true;
 | 
			
		||||
	nano::system system;
 | 
			
		||||
	auto node = system.add_node (node_flags);
 | 
			
		||||
	for (auto i (0); i < node->network_params.node.max_peers_per_ip; ++i)
 | 
			
		||||
	{
 | 
			
		||||
		auto node2 (std::make_shared<nano::node> (system.io_ctx, nano::get_available_port (), nano::unique_path (), system.logging, system.work, node_flags));
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -105,7 +105,10 @@ nano::network::~network ()
 | 
			
		|||
 | 
			
		||||
void nano::network::start ()
 | 
			
		||||
{
 | 
			
		||||
	ongoing_cleanup ();
 | 
			
		||||
	if (!node.flags.disable_connection_cleanup)
 | 
			
		||||
	{
 | 
			
		||||
		ongoing_cleanup ();
 | 
			
		||||
	}
 | 
			
		||||
	ongoing_syn_cookie_cleanup ();
 | 
			
		||||
	if (!node.flags.disable_udp)
 | 
			
		||||
	{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -148,6 +148,7 @@ public:
 | 
			
		|||
	bool enable_pruning{ false };
 | 
			
		||||
	bool fast_bootstrap{ false };
 | 
			
		||||
	bool read_only{ false };
 | 
			
		||||
	bool disable_connection_cleanup{ false };
 | 
			
		||||
	nano::confirmation_height_mode confirmation_height_processor_mode{ nano::confirmation_height_mode::automatic };
 | 
			
		||||
	nano::generate_cache generate_cache;
 | 
			
		||||
	bool inactive_node{ false };
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue