You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/03/17 23:58:15 UTC
[15/33] incubator-geode git commit: GEODE-1007 CI failure:
ClientAuthroizationTwoDUnitTest.testAllOpsWithFailover2
GEODE-1007 CI failure: ClientAuthroizationTwoDUnitTest.testAllOpsWithFailover2
The previous fix caused ClientAuthorizationDUnitTest.testAllOpsWithFailover
to have problems.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f4b20379
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f4b20379
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f4b20379
Branch: refs/heads/feature/GEODE-1050
Commit: f4b203793e0cb1b16a09cc3ae6eed570ecfd1ef4
Parents: 79d2990
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Mar 16 11:00:41 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Mar 16 12:41:20 2016 -0700
----------------------------------------------------------------------
.../security/ClientAuthorizationTestBase.java | 25 +++++++++++++-------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f4b20379/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
index cc468e1..8476ae2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestBase.java
@@ -855,12 +855,17 @@ public class ClientAuthorizationTestBase extends DistributedTestCase {
Properties serverProps = buildProperties(authenticator, accessor, false,
extraAuthProps, extraAuthzProps);
// Get ports for the servers
- int port1 = 0;
+ Keeper locator1PortKeeper = AvailablePort.getRandomAvailablePortKeeper(AvailablePort.SOCKET);
+ Keeper locator2PortKeeper = AvailablePort.getRandomAvailablePortKeeper(AvailablePort.SOCKET);
+ Keeper port1Keeper = AvailablePort.getRandomAvailablePortKeeper(AvailablePort.SOCKET);
Keeper port2Keeper = AvailablePort.getRandomAvailablePortKeeper(AvailablePort.SOCKET);
+ int locator1Port = locator1PortKeeper.getPort();
+ int locator2Port = locator2PortKeeper.getPort();
+ int port1 = port1Keeper.getPort();
int port2 = port2Keeper.getPort();
// Perform all the ops on the clients
- List<OperationWithAction> opBlock = new ArrayList<>();
+ List opBlock = new ArrayList();
Random rnd = new Random();
for (int opNum = 0; opNum < opCodes.length; ++opNum) {
// Start client with valid credentials as specified in
@@ -871,20 +876,22 @@ public class ClientAuthorizationTestBase extends DistributedTestCase {
// End of current operation block; execute all the operations
// on the servers with/without failover
if (opBlock.size() > 0) {
+ locator1PortKeeper.release();
+ port1Keeper.release();
// Start the first server and execute the operation block
- final int locatorPort = 0;
- port1 = server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
- locatorPort, 0, serverProps,
+ server1.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
+ locator1Port, port1, serverProps,
javaProps ));
server2.invoke(() -> SecurityTestUtil.closeCache());
executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
extraAuthzProps, tgen, rnd);
if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
// Failover to the second server and run the block again
- final String locatorString = null;
- port2 = server2.invoke(() -> SecurityTestUtil.createCacheServer(
- serverProps, javaProps, null, locatorString, 0, Boolean.TRUE,
- SecurityTestUtil.NO_EXCEPTION ));
+ locator2PortKeeper.release();
+ port2Keeper.release();
+ server2.invoke(() -> ClientAuthorizationTestBase.createCacheServer(
+ locator2Port, port2, serverProps,
+ javaProps ));
server1.invoke(() -> SecurityTestUtil.closeCache());
executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
extraAuthzProps, tgen, rnd);