about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-24 12:42:02 -0800
committerbors <bors@rust-lang.org>2014-02-24 12:42:02 -0800
commit68a4f7d9babb0c638f3425ced08e13f9fbfdcf56 (patch)
tree474472bd05e4e9570c3b008768939407c247ffa8 /src/libstd
parent672097753a217d4990129cbdfab16ef8c9b08b21 (diff)
parent13a8fcd3e9cfc49e8cc1d50d132188ded311f9db (diff)
downloadrust-68a4f7d9babb0c638f3425ced08e13f9fbfdcf56.tar.gz
rust-68a4f7d9babb0c638f3425ced08e13f9fbfdcf56.zip
auto merge of #12523 : alexcrichton/rust/ignore-some-windows-tests, r=pnkfelix
These two tests are notoriously flaky on the windows bots right now, so I'm
ignoring them until I can investigate them some more. The truncate_works test
has been flaky for quite some time, but it has gotten much worse recently. The
test_exists test has been flaky since the recent std::run rewrite landed.
Finally, the "unix pipe" test failure is a recent discovery on the try bots. I
haven't seen this failing much, but better safe than sorry!

cc #12516
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/fs.rs5
-rw-r--r--src/libstd/io/net/unix.rs2
-rw-r--r--src/libstd/io/process.rs6
3 files changed, 7 insertions, 6 deletions
diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs
index 58c0caa3402..ffccb0e8cb1 100644
--- a/src/libstd/io/fs.rs
+++ b/src/libstd/io/fs.rs
@@ -1106,9 +1106,8 @@ mod test {
         file.fsync().unwrap();
         file.datasync().unwrap();
         drop(file);
-    })
+    } #[ignore(cfg(windows))])
 
-    #[ignore(cfg(windows))] // FIXME(#11638)
     iotest!(fn truncate_works() {
         let tmpdir = tmpdir();
         let path = tmpdir.join("in.txt");
@@ -1138,7 +1137,7 @@ mod test {
         assert_eq!(File::open(&path).read_to_end().unwrap(),
                    (bytes!("fo", 0, 0, 0, 0, "wut")).to_owned());
         drop(file);
-    })
+    } #[ignore(cfg(windows))]) // FIXME(#11638)
 
     iotest!(fn open_flavors() {
         let tmpdir = tmpdir();
diff --git a/src/libstd/io/net/unix.rs b/src/libstd/io/net/unix.rs
index a1f3cbbe326..c3e3d72c672 100644
--- a/src/libstd/io/net/unix.rs
+++ b/src/libstd/io/net/unix.rs
@@ -192,7 +192,7 @@ mod tests {
         }, proc(_client) {
             // drop the client
         })
-    })
+    } #[ignore(cfg(windows))]) // FIXME(#12516)
 
     iotest!(fn write_begone() {
         smalltest(proc(mut server) {
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs
index b3365726465..b782cf1d21a 100644
--- a/src/libstd/io/process.rs
+++ b/src/libstd/io/process.rs
@@ -814,7 +814,10 @@ mod tests {
     }
     #[cfg(windows)]
     pub fn sleeper() -> Process {
-        Process::new("timeout", [~"1000"]).unwrap()
+        // There's a `timeout` command on windows, but it doesn't like having
+        // its output piped, so instead just ping ourselves a few times with
+        // gaps inbetweeen so we're sure this process is alive for awhile
+        Process::new("ping", [~"127.0.0.1", ~"-n", ~"1000"]).unwrap()
     }
 
     iotest!(fn test_kill() {
@@ -823,7 +826,6 @@ mod tests {
         assert!(!p.wait().success());
     })
 
-    #[ignore(cfg(windows))]
     iotest!(fn test_exists() {
         let mut p = sleeper();
         assert!(Process::kill(p.id(), 0).is_ok());