mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: limit number of loops in `routes_to` 

The `routes_to` function can loop infinitely during test.

To prevent this from happening a number of tries variable is added. It
checks that the number of tries does not exceed 30, which gives the
function about 3 seconds to complete -- due to the call to
`thread::sleep` using 100ms.

Signed-off-by: Fintan Halpenny <fintan.halpenny@gmail.com>
X-Clacks-Overhead: GNU Terry Pratchett
This commit is contained in:
Fintan Halpenny 2023-03-06 09:47:52 +00:00
parent d476d35887
commit 0302701c98
No known key found for this signature in database
GPG Key ID: 2552FB6F64066CB7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
radicle-node/src/test/environment.rs
View File

@ -165,7 +165,13 @@ impl<G: Signer + cyphernet::Ecdh> NodeHandle<G> {
/// Wait until this node's routing table contains the given routes. /// Wait until this node's routing table contains the given routes.
#[track_caller] #[track_caller]
pub fn routes_to(&self, routes: &[(Id, NodeId)]) { pub fn routes_to(&self, routes: &[(Id, NodeId)]) {
let mut tries = 0;
loop { loop {
// ~3s to converge to the correct routes
if tries > 30 {
panic!("Node::routes_to: routing tables did not converge to include given routes")
}
let mut remaining: BTreeSet<_> = routes.iter().collect(); let mut remaining: BTreeSet<_> = routes.iter().collect();
for (rid, nid) in self.handle.routing().unwrap() { for (rid, nid) in self.handle.routing().unwrap() {
@ -179,6 +185,7 @@ impl<G: Signer + cyphernet::Ecdh> NodeHandle<G> {
if remaining.is_empty() { if remaining.is_empty() {
break; break;
} }
tries += 1;
thread::sleep(Duration::from_millis(100)); thread::sleep(Duration::from_millis(100));
} }
log::debug!(target: "test", "Node {} routes to {:?}", self.id, routes); log::debug!(target: "test", "Node {} routes to {:?}", self.id, routes);