From 5e6bbc6bfa82f3ad0a014df24b40cbc042f24035 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 5 Nov 2013 23:29:11 -0800 Subject: Assorted test fixes and merge conflicts --- src/libstd/rt/io/fs.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/libstd/rt') diff --git a/src/libstd/rt/io/fs.rs b/src/libstd/rt/io/fs.rs index f9e622b1f1e..06c07308cf6 100644 --- a/src/libstd/rt/io/fs.rs +++ b/src/libstd/rt/io/fs.rs @@ -589,7 +589,8 @@ pub fn rmdir_recursive(path: &Path) { /// Changes the timestamps for a file's last modification and access time. /// The file at the path specified will have its last access time set to -/// `atime` and its modification time set to `mtime`. +/// `atime` and its modification time set to `mtime`. The times specified should +/// be in milliseconds. /// /// # Errors /// @@ -1266,9 +1267,9 @@ mod test { let path = tmpdir.join("a"); File::create(&path); - change_file_times(&path, 100, 200); - assert_eq!(path.stat().accessed, 100); - assert_eq!(path.stat().modified, 200); + change_file_times(&path, 1000, 2000); + assert_eq!(path.stat().accessed, 1000); + assert_eq!(path.stat().modified, 2000); rmdir_recursive(&tmpdir); } -- cgit 1.4.1-3-g733a5