ISPN-8615 Test fix small timeout

infinispan · Jan 11, 2018 · a8541d2 · a8541d2
1 parent b69e533
commit a8541d2
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/lock/src/test/java/org/infinispan/lock/impl/lock/ClusteredLockImplTest.java b/lock/src/test/java/org/infinispan/lock/impl/lock/ClusteredLockImplTest.java
@@ -89,14 +89,13 @@ public void testFastLockWithTimeout() throws Throwable {
 
    public void testTryLockWithTimeoutAfterLockWithSmallTimeout() throws Throwable {
       assertTrue(await(lock.tryLock()));
-      CompletableFuture<Boolean> tryLock = lock.tryLock(1, TimeUnit.NANOSECONDS);
-      await(lock.unlock());
-      assertFalse(await(tryLock));
+      assertFalse(await(lock.tryLock(1, TimeUnit.NANOSECONDS)));
    }
 
    public void testTryLockWithTimeoutAfterLockWithBigTimeout() throws Throwable {
       assertTrue(await(lock.tryLock()));
       CompletableFuture<Boolean> tryLock = lock.tryLock(1, TimeUnit.SECONDS);
+      TimeUnit.MILLISECONDS.sleep(100);
       await(lock.unlock());
       assertTrue(await(tryLock));
    }
@@ -121,7 +120,6 @@ public void testLockAfterLockRemove() throws Throwable {
       await(call
             .exceptionally(e -> {
                assertException(ClusteredLockException.class, e);
-               //assertEquals(Log.LOCK_DELETE_MSG, e.getMessage());
                return null;
             }));
       assertTrue(call.isCompletedExceptionally());
@@ -134,7 +132,6 @@ public void testTryLockAfterLockRemove() throws Throwable {
       await(call
             .exceptionally(e -> {
                assertException(ClusteredLockException.class, e);
-               //assertEquals(Log.LOCK_DELETE_MSG, e.getMessage());
                return null;
             }));
       assertTrue(call.isCompletedExceptionally());
@@ -147,7 +144,6 @@ public void testTryLockWithTimeoutAfterLockRemove() throws Throwable {
       await(call
             .exceptionally(e -> {
                assertException(ClusteredLockException.class, e);
-               //assertEquals(Log.LOCK_DELETE_MSG, e.getMessage());
                return null;
             }));
       assertTrue(call.isCompletedExceptionally());
@@ -160,7 +156,6 @@ public void testIsLockedAfterLockRemove() throws Throwable {
       await(call
             .exceptionally(e -> {
                assertException(ClusteredLockException.class, e);
-               //assertEquals(Log.LOCK_DELETE_MSG, e.getMessage());
                return null;
             }));
       assertTrue(call.isCompletedExceptionally());
@@ -173,7 +168,6 @@ public void testIsLockedByMeAfterLockRemove() throws Throwable {
       await(call
             .exceptionally(e -> {
                assertException(ClusteredLockException.class, e);
-               //assertEquals(Log.LOCK_DELETE_MSG, e.getMessage());
                return null;
             }));
       assertTrue(call.isCompletedExceptionally());