Merge branch 'master' into namespace

src/test/mod.rs

@@ -1,3 +1,6 @@
+// time related functionality in lib.rs
+mod test_time;
+
 // client.rs excluding functionality that involves ports or callbacks
 mod test_client;
 

src/test/test_time.rs

@@ -0,0 +1,14 @@
+use super::super::*;
+
+#[test]
+fn time_can_get_time() {
+    get_time();
+}
+
+#[test]
+fn time_is_monotonically_increasing() {
+    let initial_t = get_time();
+    default_sleep();
+    let later_t = get_time();
+    assert!(initial_t < later_t, "failed {} < {}", initial_t, later_t);
+}