auto merge of #7258 : huonw/rust/7256, r=bstrie

bors · bors · commit 2b581c17b56e · 2013-06-23T05:34:56.000-07:00
diff --git a/src/libextra/time.rs b/src/libextra/time.rs
@@ -1142,6 +1142,9 @@ mod tests {
         assert!(result::unwrap(strptime("-0800", "%z")).tm_gmtoff ==
             0);
         assert!(test("%", "%%"));
+
+        // Test for #7256
+        assert_eq!(strptime("360", "%Y-%m-%d"), Err(~"Invalid year"))
     }
 
     fn test_ctime() {

Original file line number	Diff line number	Diff line change
`@@ -1142,6 +1142,9 @@ mod tests {`
`1142`	`1142`	`assert!(result::unwrap(strptime("-0800", "%z")).tm_gmtoff ==`
`1143`	`1143`	`0);`
`1144`	`1144`	`assert!(test("%", "%%"));`
	`1145`	`+`
	`1146`	`+ // Test for #7256`
	`1147`	`+ assert_eq!(strptime("360", "%Y-%m-%d"), Err(~"Invalid year"))`
`1145`	`1148`	`}`
`1146`	`1149`
`1147`	`1150`	`fn test_ctime() {`