gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid port conflict in new_with_external_ip_test_gossip

Browse Source
This commit is contained in:
Michael Vines
2020-04-09 19:03:25 -07:00
parent 7b71a331c6
commit 85feca305b
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/cluster_info.rs
View File

@ -1998,20 +1998,16 @@ mod tests {
#[test] #[test]
fn new_with_external_ip_test_gossip() { fn new_with_external_ip_test_gossip() {
let ip = IpAddr::V4(Ipv4Addr::from(0)); // Can't use VALIDATOR_PORT_RANGE because if this test runs in parallel with others, the
let port = { // port returned by `bind_in_range()` might be snatched up before `Node::new_with_external_ip()` runs
bind_in_range(ip, VALIDATOR_PORT_RANGE) let port_range = (VALIDATOR_PORT_RANGE.1 + 10, VALIDATOR_PORT_RANGE.1 + 20);
.expect("Failed to bind")
.0
};
let node = Node::new_with_external_ip(
&Pubkey::new_rand(),
&socketaddr!(0, port),
VALIDATOR_PORT_RANGE,
ip,
);
check_node_sockets(&node, ip, VALIDATOR_PORT_RANGE); let ip = IpAddr::V4(Ipv4Addr::from(0));
let port = bind_in_range(ip, port_range).expect("Failed to bind").0;
let node =
Node::new_with_external_ip(&Pubkey::new_rand(), &socketaddr!(0, port), port_range, ip);
check_node_sockets(&node, ip, port_range);
assert_eq!(node.sockets.gossip.local_addr().unwrap().port(), port); assert_eq!(node.sockets.gossip.local_addr().unwrap().port(), port);
} }