Skip to content

Commit 47e027a

Browse files
committed
remove linger test from custo sockopt module
1 parent 28d4ca9 commit 47e027a

File tree

1 file changed

+41
-57
lines changed

1 file changed

+41
-57
lines changed

test/sys/test_sockopt.rs

Lines changed: 41 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,69 +1063,53 @@ fn test_ipv6_recv_traffic_class_opts() {
10631063
);
10641064
}
10651065

1066-
/// Users should be able to define their own sockopts.
1067-
mod sockopt_impl {
1068-
use nix::sys::socket::{
1069-
getsockopt, setsockopt, socket, AddressFamily, SockFlag, SockProtocol,
1070-
SockType,
1071-
};
1072-
1073-
sockopt_impl!(
1074-
Linger,
1075-
Both,
1076-
libc::SOL_SOCKET,
1077-
libc::SO_LINGER,
1078-
libc::linger
1079-
);
1080-
#[test]
1081-
fn test_linger() {
1082-
let fd = socket(
1083-
AddressFamily::Inet,
1084-
SockType::Stream,
1085-
SockFlag::empty(),
1086-
None,
1087-
)
1088-
.unwrap();
1066+
#[test]
1067+
fn test_linger() {
1068+
let fd = socket(
1069+
AddressFamily::Inet,
1070+
SockType::Stream,
1071+
SockFlag::empty(),
1072+
None,
1073+
)
1074+
.unwrap();
10891075

1090-
let set_linger = libc::linger {
1091-
l_onoff: 1,
1092-
l_linger: 42,
1093-
};
1094-
setsockopt(&fd, Linger, &set_linger).unwrap();
1076+
let set_linger = libc::linger {
1077+
l_onoff: 1,
1078+
l_linger: 42,
1079+
};
1080+
setsockopt(&fd, sockopt::Linger, &set_linger).unwrap();
10951081

1096-
let get_linger = getsockopt(&fd, Linger).unwrap();
1097-
assert_eq!(get_linger.l_linger, set_linger.l_linger);
1098-
}
1082+
let get_linger = getsockopt(&fd, sockopt::Linger).unwrap();
1083+
assert_eq!(get_linger.l_linger, set_linger.l_linger);
1084+
}
10991085

1100-
#[cfg(apple_targets)]
1101-
sockopt_impl!(
1102-
LingerSec,
1103-
Both,
1104-
libc::SOL_SOCKET,
1105-
libc::SO_LINGER_SEC,
1106-
libc::linger
1107-
);
1086+
#[cfg(apple_targets)]
1087+
#[test]
1088+
fn test_linger_sec() {
1089+
let fd = socket(
1090+
AddressFamily::Inet,
1091+
SockType::Stream,
1092+
SockFlag::empty(),
1093+
None,
1094+
)
1095+
.unwrap();
11081096

1109-
#[cfg(apple_targets)]
1110-
#[test]
1111-
fn test_linger_sec() {
1112-
let fd = socket(
1113-
AddressFamily::Inet,
1114-
SockType::Stream,
1115-
SockFlag::empty(),
1116-
None,
1117-
)
1118-
.unwrap();
1097+
let set_linger = libc::linger {
1098+
l_onoff: 1,
1099+
l_linger: 1,
1100+
};
1101+
setsockopt(&fd, sockopt::LingerSec, &set_linger).unwrap();
11191102

1120-
let set_linger = libc::linger {
1121-
l_onoff: 1,
1122-
l_linger: 1,
1123-
};
1124-
setsockopt(&fd, LingerSec, &set_linger).unwrap();
1103+
let get_linger = getsockopt(&fd, sockopt::Linger).unwrap();
1104+
assert_eq!(get_linger.l_linger, set_linger.l_linger * 100);
1105+
}
11251106

1126-
let get_linger = getsockopt(&fd, Linger).unwrap();
1127-
assert_eq!(get_linger.l_linger, set_linger.l_linger * 100);
1128-
}
1107+
/// Users should be able to define their own sockopts.
1108+
mod sockopt_impl {
1109+
use nix::sys::socket::{
1110+
getsockopt, setsockopt, socket, AddressFamily, SockFlag, SockProtocol,
1111+
SockType,
1112+
};
11291113

11301114
sockopt_impl!(KeepAlive, Both, libc::SOL_SOCKET, libc::SO_KEEPALIVE, bool);
11311115

0 commit comments

Comments
 (0)