diff options
| author | Emīls <emils@mullvad.net> | 2022-02-15 15:21:50 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2022-02-15 15:21:50 +0000 |
| commit | 96cb2008d9a79a6923eee34537dd264a18c79512 (patch) | |
| tree | 4b5e0e7c5dc684eb79c118f85498e907fda2a965 | |
| parent | e0107f9b07bd4d06c59966cb0f30697a7fc71641 (diff) | |
| parent | 039efebabccb1050c3faf54d095db62c07481267 (diff) | |
| download | mullvadvpn-96cb2008d9a79a6923eee34537dd264a18c79512.tar.xz mullvadvpn-96cb2008d9a79a6923eee34537dd264a18c79512.zip | |
Merge branch 'improve-conncheck-test'
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/connectivity_check.rs | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/talpid-core/src/tunnel/wireguard/connectivity_check.rs b/talpid-core/src/tunnel/wireguard/connectivity_check.rs index 553943b576..162fb248a3 100644 --- a/talpid-core/src/tunnel/wireguard/connectivity_check.rs +++ b/talpid-core/src/tunnel/wireguard/connectivity_check.rs @@ -801,22 +801,13 @@ mod test { .unwrap(); } }); - let err = DELAY_ON_INITIAL_SETUP + Duration::from_millis(100); - assert!(!result_rx - .recv_timeout(Duration::from_millis(500) + err) - .unwrap() - .unwrap()); - assert!(!result_rx - .recv_timeout(Duration::from_secs(1) + err) - .unwrap() - .unwrap()); - assert!(!result_rx - .recv_timeout(Duration::from_secs(2) + err) - .unwrap() - .unwrap()); - assert!(!result_rx - .recv_timeout(Duration::from_secs(2) + err) - .unwrap() - .unwrap()); + let err = DELAY_ON_INITIAL_SETUP + Duration::from_millis(350); + let assert_rx = |recv_timeout: Duration| { + assert!(!result_rx.recv_timeout(recv_timeout + err).unwrap().unwrap()); + }; + assert_rx(Duration::from_millis(500)); + assert_rx(Duration::from_secs(1)); + assert_rx(Duration::from_secs(2)); + assert_rx(Duration::from_secs(2)); } } |