grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix failing node-table tests on mac os, closes #9632 (#9633)

Browse Source
This commit is contained in:
Marek Kotewicz 2018-09-24 21:51:16 +01:00 committed by GitHub
parent adcbfcf8d6
commit 5a1dc3eb8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/network-devp2p/src/node_table.rs
View File

@ -624,19 +624,29 @@ mod tests {
// unknown - node 6 // unknown - node 6
// nodes are also ordered according to their addition time
//
// nanosecond precision lost since mac os x high sierra update so let's not compare their order
// https://github.com/paritytech/parity-ethereum/issues/9632
let r = table.nodes(&IpFilter::default()); let r = table.nodes(&IpFilter::default());
assert_eq!(r[0][..], id4[..]); // most recent success // most recent success
assert_eq!(r[1][..], id3[..]); assert!(
(r[0] == id4 && r[1] == id3) ||
(r[0] == id3 && r[1] == id4)
);
// unknown (old contacts and new nodes), randomly shuffled // unknown (old contacts and new nodes), randomly shuffled
assert!( assert!(
r[2][..] == id5[..] && r[3][..] == id6[..] || (r[2] == id5 && r[3] == id6) ||
r[2][..] == id6[..] && r[3][..] == id5[..] (r[2] == id6 && r[3] == id5)
); );
assert_eq!(r[4][..], id1[..]); // oldest failure // oldest failure
assert_eq!(r[5][..], id2[..]); assert!(
(r[4] == id1 && r[5] == id2) ||
(r[4] == id2 && r[5] == id1)
);
} }
#[test] #[test]