@@ -27,7 +27,7 @@ mod sixplane {
27
27
let mut ips = service. lookup_aaaa ( record. clone ( ) ) . await ;
28
28
ips. sort ( ) ;
29
29
30
- assert_eq ! ( ips. sort ( ) , listen_ips. clone( ) . to_ipv6_vec( ) . sort ( ) ) ;
30
+ assert_eq ! ( ips, listen_ips. clone( ) . to_ipv6_vec( ) ) ;
31
31
}
32
32
}
33
33
@@ -173,7 +173,7 @@ mod rfc4193 {
173
173
let mut ips = service. lookup_aaaa ( record. clone ( ) ) . await ;
174
174
ips. sort ( ) ;
175
175
176
- assert_eq ! ( ips. sort ( ) , listen_ips. clone( ) . to_ipv6_vec( ) . sort ( ) ) ;
176
+ assert_eq ! ( ips, listen_ips. clone( ) . to_ipv6_vec( ) ) ;
177
177
}
178
178
179
179
let ptr_records: Vec < String > = service
@@ -204,10 +204,10 @@ mod rfc4193 {
204
204
for _ in 0 ..10000 {
205
205
// randomly switch order
206
206
if rand:: random :: < bool > ( ) {
207
- assert_eq ! (
208
- service . lookup_aaaa ( record . clone ( ) ) . await . sort( ) ,
209
- listen_ips . clone ( ) . to_ipv6_vec ( ) . sort ( )
210
- ) ;
207
+ let mut ips = service . lookup_aaaa ( record . clone ( ) ) . await ;
208
+ ips . sort ( ) ;
209
+
210
+ assert_eq ! ( ips , listen_ips . clone ( ) . to_ipv6_vec ( ) , ) ;
211
211
212
212
assert_eq ! (
213
213
service
@@ -229,10 +229,9 @@ mod rfc4193 {
229
229
& record. to_string( )
230
230
) ;
231
231
232
- assert_eq ! (
233
- service. lookup_aaaa( record. clone( ) ) . await . sort( ) ,
234
- listen_ips. clone( ) . to_ipv6_vec( ) . sort( )
235
- ) ;
232
+ let mut ips = service. lookup_aaaa ( record. clone ( ) ) . await ;
233
+ ips. sort ( ) ;
234
+ assert_eq ! ( ips, listen_ips. clone( ) . to_ipv6_vec( ) , ) ;
236
235
}
237
236
}
238
237
}
@@ -454,7 +453,7 @@ mod ipv4 {
454
453
let mut ips = service. lookup_a ( record. clone ( ) ) . await ;
455
454
ips. sort ( ) ;
456
455
457
- assert_eq ! ( ips. sort ( ) , listen_ips. clone( ) . to_ipv4_vec( ) . sort ( ) ) ;
456
+ assert_eq ! ( ips, listen_ips. clone( ) . to_ipv4_vec( ) ) ;
458
457
}
459
458
460
459
let ptr_records: Vec < String > = service
@@ -485,10 +484,9 @@ mod ipv4 {
485
484
for _ in 0 ..10000 {
486
485
// randomly switch order
487
486
if rand:: random :: < bool > ( ) {
488
- assert_eq ! (
489
- service. lookup_a( record. clone( ) ) . await . sort( ) ,
490
- listen_ips. clone( ) . to_ipv4_vec( ) . sort( )
491
- ) ;
487
+ let mut ips = service. lookup_a ( record. clone ( ) ) . await ;
488
+ ips. sort ( ) ;
489
+ assert_eq ! ( ips, listen_ips. clone( ) . to_ipv4_vec( ) , ) ;
492
490
493
491
assert_eq ! (
494
492
service
@@ -510,10 +508,9 @@ mod ipv4 {
510
508
& record. to_string( )
511
509
) ;
512
510
513
- assert_eq ! (
514
- service. lookup_a( record. clone( ) ) . await . sort( ) ,
515
- listen_ips. clone( ) . to_ipv4_vec( ) . sort( )
516
- ) ;
511
+ let mut ips = service. lookup_a ( record. clone ( ) ) . await ;
512
+ ips. sort ( ) ;
513
+ assert_eq ! ( ips, listen_ips. clone( ) . to_ipv4_vec( ) , ) ;
517
514
}
518
515
}
519
516
}
@@ -705,11 +702,13 @@ async fn test_get_listen_ip() -> Result<(), anyhow::Error> {
705
702
TestNetwork :: new_multi_ip ( "basic-ipv4" , & mut TestContext :: default ( ) . await , ips. clone ( ) )
706
703
. await
707
704
. unwrap ( ) ;
705
+ ips. sort ( ) ;
708
706
709
707
let mut listen_ips =
710
708
get_listen_ips ( & authtoken_path ( None ) , & tn. network . clone ( ) . id . unwrap ( ) ) . await ?;
709
+ listen_ips. sort ( ) ;
711
710
712
- assert_eq ! ( listen_ips. sort ( ) , ips. sort ( ) ) ;
711
+ assert_eq ! ( listen_ips, ips) ;
713
712
eprintln ! ( "My listen IPs are {}" , listen_ips. join( ", " ) ) ;
714
713
715
714
let tn = TestNetwork :: new ( "rfc4193-only" , & mut TestContext :: default ( ) . await )
@@ -718,10 +717,12 @@ async fn test_get_listen_ip() -> Result<(), anyhow::Error> {
718
717
719
718
let mut listen_ips =
720
719
get_listen_ips ( & authtoken_path ( None ) , & tn. network . clone ( ) . id . unwrap ( ) ) . await ?;
720
+ listen_ips. sort ( ) ;
721
721
722
722
let mut ips = vec ! [ tn. member( ) . clone( ) . rfc4193( ) ?. ip( ) . to_string( ) ] ;
723
+ ips. sort ( ) ;
723
724
724
- assert_eq ! ( listen_ips. sort ( ) , ips. sort ( ) ) ;
725
+ assert_eq ! ( listen_ips, ips) ;
725
726
eprintln ! ( "My listen IPs are {}" , listen_ips. join( ", " ) ) ;
726
727
727
728
drop ( tn) ;
@@ -732,10 +733,12 @@ async fn test_get_listen_ip() -> Result<(), anyhow::Error> {
732
733
733
734
let mut listen_ips =
734
735
get_listen_ips ( & authtoken_path ( None ) , & tn. network . clone ( ) . id . unwrap ( ) ) . await ?;
736
+ listen_ips. sort ( ) ;
735
737
736
738
let mut ips = vec ! [ tn. member( ) . clone( ) . sixplane( ) ?. ip( ) . to_string( ) ] ;
739
+ ips. sort ( ) ;
737
740
738
- assert_eq ! ( listen_ips. sort ( ) , ips. sort ( ) ) ;
741
+ assert_eq ! ( listen_ips, ips) ;
739
742
eprintln ! ( "My listen IPs are {}" , listen_ips. join( ", " ) ) ;
740
743
741
744
Ok ( ( ) )
0 commit comments