Added more tests

djspiewak · Jan 14, 2011 · 126bdd1 · 126bdd1
1 parent 8122d42
commit 126bdd1
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/test/scala/scala/concurrent/stm/RetrySuite.scala b/src/test/scala/scala/concurrent/stm/RetrySuite.scala
@@ -418,4 +418,17 @@ class RetrySuite extends FunSuite {
       TxnExecutor.transformDefault( _ => orig )
     }
   }
+
+  test("tighter timeout wins") {
+    val t0 = System.currentTimeMillis
+    intercept[InterruptedException] {
+      atomic.withRetryTimeout(100) { implicit txn =>
+        atomic.withRetryTimeout(1000) { implicit txn =>
+          retry
+        }
+      }
+    }
+    val elapsed = System.currentTimeMillis - t0
+    assert(elapsed >= 100 && elapsed < 150)
+  }
 }