You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2020/04/19 14:10:46 UTC
[curator] 02/02: CURATOR-567 - remove flaky cases of TestCleanState
This is an automated email from the ASF dual-hosted git repository.
randgalt pushed a commit to branch CURATOR-567-remove-test-clean-state-where-flaky
in repository https://gitbox.apache.org/repos/asf/curator.git
commit 7770d47676d8e396ce3c5b8d087de711f320092c
Author: randgalt <ra...@apache.org>
AuthorDate: Sun Apr 19 09:10:32 2020 -0500
CURATOR-567 - remove flaky cases of TestCleanState
---
.../recipes/locks/TestInterProcessMutexBase.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
index bd07d6b..6e3b6ed 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessMutexBase.java
@@ -22,7 +22,6 @@ package org.apache.curator.framework.recipes.locks;
import com.google.common.collect.Lists;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.framework.imps.TestCleanState;
import org.apache.curator.framework.state.ConnectionState;
import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -150,7 +149,7 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
}
finally
{
- TestCleanState.closeAndTestClean(client);
+ CloseableUtils.closeQuietly(client);
}
}
@@ -204,7 +203,7 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
}
finally
{
- client.close();
+ CloseableUtils.closeQuietly(client);
}
}
@@ -302,7 +301,7 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
}
finally
{
- TestCleanState.closeAndTestClean(client);
+ CloseableUtils.closeQuietly(client);
}
}
@@ -333,9 +332,9 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
{
semaphore.acquire();
mutex.acquire();
- Assert.assertTrue(hasLock.compareAndSet(false, true));
try
{
+ Assert.assertTrue(hasLock.compareAndSet(false, true));
if ( isFirst.compareAndSet(true, false) )
{
semaphore.release(THREAD_QTY - 1);
@@ -368,7 +367,7 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
}
finally
{
- TestCleanState.closeAndTestClean(client);
+ CloseableUtils.closeQuietly(client);
}
}
@@ -414,7 +413,7 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
}
finally
{
- TestCleanState.closeAndTestClean(client);
+ CloseableUtils.closeQuietly(client);
}
}
@@ -431,7 +430,7 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
}
finally
{
- TestCleanState.closeAndTestClean(client);
+ CloseableUtils.closeQuietly(client);
}
}
@@ -569,8 +568,8 @@ public abstract class TestInterProcessMutexBase extends BaseClassForTests
}
finally
{
- TestCleanState.closeAndTestClean(client1);
- TestCleanState.closeAndTestClean(client2);
+ CloseableUtils.closeQuietly(client1);
+ CloseableUtils.closeQuietly(client2);
}
}
}