test/dblock_test.rb in rsched-0.2.0 vs test/dblock_test.rb in rsched-0.3.0

@@ -32,14 +32,15 @@
 
     # different host can't lock
     token = db2.acquire('ident1', time, now)
     assert_equal false, token
 
-    # same host can relock
-    token = db1.acquire('ident1', time, now)
-    assert_not_equal nil, token
-    assert_not_equal false, token
+    # v0.4.0: same host can't relock
+    ## same host can relock
+    #token = db1.acquire('ident1', time, now)
+    #assert_not_equal nil, token
+    #assert_not_equal false, token
 
     # different identifier
     token = db2.acquire('ident2', time, now)
     assert_not_equal nil, token
     assert_not_equal false, token
@@ -133,20 +134,22 @@
 
     token = db1.acquire('ident1', time, now)
     assert_not_equal nil, token
     assert_not_equal false, token
 
-    # same host can relock
-    # + extend timeout
-    token = db1.acquire('ident1', time, now+TIMEOUT)
-    assert_not_equal nil, token
-    assert_not_equal false, token
+    # different host can't extend (even if same token)
+    ok = db2.extend_timeout(token, now+TIMEOUT*2)
+    assert_equal false, ok
 
-    # timeout is extended
+    # same host can extend timeout
+    ok = db1.extend_timeout(token, now+TIMEOUT*2)
+    assert_equal true, ok
+
+    # timeout is extended; different host can't lock
     token_ = db2.acquire('ident1', time, now+TIMEOUT+1)
     assert_equal false, token_
 
-    # extended timeout is expired
+    # extended timeout is expired; different host can lock
     token = db2.acquire('ident1', time, now+TIMEOUT*2+1)
     assert_not_equal nil, token
     assert_not_equal false, token
   end
 end