summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-01-11 05:15:35 +0000
committerGitHub <noreply@github.com>2022-01-11 05:15:35 +0000
commitf8e27505f5f09e9f6e11422ee47a8229f84d1f84 (patch)
tree989de853940d88c10da34f14742845a9b792d114
parentb641788f8f94b250cfbb040b37174829ef7f251c (diff)
parentebd4acebc004ac98bba07adb2d009f747552ab4a (diff)
downloadnix-f8e27505f5f09e9f6e11422ee47a8229f84d1f84.zip
Merge #1630
1630: Change port used by test_txtime to avoid conflict r=asomers a=rtzoeller The socket tests request specific ports, and `test_timestamping` and `test_txtime` are currently conflicting in the port they request. This leads to the second of the tests failing with `EADDRINUSE` when run locally. Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
-rw-r--r--test/sys/test_socket.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs
index 5262d3b8..01f5f878 100644
--- a/test/sys/test_socket.rs
+++ b/test/sys/test_socket.rs
@@ -2013,7 +2013,7 @@ pub fn test_txtime() {
require_kernel_version!(test_txtime, ">= 5.8");
- let std_sa = SocketAddr::from_str("127.0.0.1:6790").unwrap();
+ let std_sa = SocketAddr::from_str("127.0.0.1:6802").unwrap();
let inet_addr = InetAddr::from_std(&std_sa);
let sock_addr = SockAddr::new_inet(inet_addr);