Skip to content

Commit a120011

Browse files
committed
auto merge of #10098 : alexcrichton/rust/attempts, r=alexcrichton
It was pretty much a miracle that these tests were ever passing. They would never have passed in the single threaded case because only one sigint in the tests is ever generated, but when run in parallel two sigints will be generated.
2 parents 16b8a41 + 8455ad8 commit a120011

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/libstd/rt/io/signal.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ mod test {
183183
Interrupt => (),
184184
s => fail!("Expected Interrupt, got {:?}", s),
185185
}
186-
match s1.port.recv() {
186+
match s2.port.recv() {
187187
Interrupt => (),
188188
s => fail!("Expected Interrupt, got {:?}", s),
189189
}

src/libstd/rt/uv/uvio.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2306,6 +2306,7 @@ fn test_read_read_read() {
23062306
}
23072307

23082308
#[test]
2309+
#[ignore(cfg(windows))] // FIXME(#10102) the server never sees the second send
23092310
fn test_udp_twice() {
23102311
do run_in_mt_newsched_task {
23112312
let server_addr = next_test_ip4();

0 commit comments

Comments
 (0)