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/05/06 21:40:55 UTC
[24/37] incubator-geode git commit: Revert "GEODE-613 CI Failure:
LocatorLoadSnapshotJUnitTest.testConcurrentBalancing"
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a35cca36/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index fd6d6c8..3a06c1c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -1505,22 +1505,11 @@ public class LocatorDUnitTest extends DistributedTestCase {
host0 + "[" + port3 + "]";
dsProps.setProperty("locators", newLocators);
-<<<<<<< Updated upstream
final InternalDistributedMember currentCoordinator = GMSJoinLeaveTestHelper.getCurrentCoordinator();
DistributedMember vm3ID = vm3.invoke(() -> GMSJoinLeaveTestHelper.getInternalDistributedSystem().getDM().getDistributionManagerId());
assertTrue("View is " + system.getDM().getMembershipManager().getView() +
" and vm3's ID is " + vm3ID,
vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
-||||||| merged common ancestors
- assertTrue(vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
- //Given the start up order of servers, this server is the elder server
- assertTrue(vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
-=======
- DistributedMember vm3ID = vm3.invoke(() -> GMSJoinLeaveTestHelper.getInternalDistributedSystem().getDM().getDistributionManagerId());
- assertTrue("View is " + system.getDM().getMembershipManager().getView() +
- " and vm3's ID is " + vm3ID,
- vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
->>>>>>> Stashed changes
startLocatorAsync(vm1, new Object[] { port2, dsProps });
startLocatorAsync(vm2, new Object[] { port3, dsProps });
@@ -1528,16 +1517,11 @@ public class LocatorDUnitTest extends DistributedTestCase {
waitCriterion = new WaitCriterion() {
public boolean done() {
try {
-<<<<<<< Updated upstream
InternalDistributedMember c = GMSJoinLeaveTestHelper.getCurrentCoordinator();
if (c.equals(currentCoordinator)) {
//now locator should be new coordinator
return false;
}
-||||||| merged common ancestors
-=======
- System.out.println("waiting for hosted locators to have 2 entries: " + system.getDM().getAllHostedLocators());
->>>>>>> Stashed changes
return system.getDM().getAllHostedLocators().size() == 2;
} catch (Exception e) {
e.printStackTrace();
@@ -1550,7 +1534,6 @@ public class LocatorDUnitTest extends DistributedTestCase {
return null;
}
};
-<<<<<<< Updated upstream
Wait.waitForCriterion(waitCriterion, 30 * 1000, 1000, true);
waitUntilLocatorBecomesCoordinator(vm1);
waitUntilLocatorBecomesCoordinator(vm2);
@@ -1562,23 +1545,6 @@ public class LocatorDUnitTest extends DistributedTestCase {
assertEquals(netviewId, (int) vm3.invoke("checking ViewID", () -> GMSJoinLeaveTestHelper.getViewId()));
assertEquals(netviewId, (int) vm4.invoke("checking ViewID", () -> GMSJoinLeaveTestHelper.getViewId()));
assertFalse(vm4.invoke("Checking ViewCreator", () -> GMSJoinLeaveTestHelper.isViewCreator()));
-||||||| merged common ancestors
- Wait.waitForCriterion(waitCriterion, 15 * 1000, 200, true);
-
- int netviewId = vm1.invoke(() -> GMSJoinLeaveTestHelper.getViewId());
- assertEquals(netviewId, (int) vm2.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertEquals(netviewId, (int) vm3.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertEquals(netviewId, (int) vm4.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertFalse(vm4.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
-=======
- Wait.waitForCriterion(waitCriterion, 30 * 1000, 1000, true);
-
- int netviewId = vm1.invoke(() -> GMSJoinLeaveTestHelper.getViewId());
- assertEquals(netviewId, (int) vm2.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertEquals(netviewId, (int) vm3.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertEquals(netviewId, (int) vm4.invoke(() -> GMSJoinLeaveTestHelper.getViewId()));
- assertFalse(vm4.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
->>>>>>> Stashed changes
//Given the start up order of servers, this server is the elder server
assertFalse(vm3.invoke("Checking ViewCreator", () -> GMSJoinLeaveTestHelper.isViewCreator()));
if (vm1.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator())) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a35cca36/geode-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
old mode 100755
new mode 100644
index 79f7ed6..05abe30
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/i18n/BasicI18nJUnitTest.java
@@ -90,8 +90,10 @@ public class BasicI18nJUnitTest extends TestCase {
private Set<String> getStringIdDefiningClasses() {
final Set<String> StringIdDefiningClasses = new LinkedHashSet<String>();
final String pkg = "com.gemstone.gemfire.internal.i18n.";
-// StringIdDefiningClasses.add(pkg + "ParentLocalizedStrings");
+ StringIdDefiningClasses.add(pkg + "ParentLocalizedStrings");
StringIdDefiningClasses.add(pkg + "LocalizedStrings");
+ // JGroupsStrings are no longer localizable
+// StringIdDefiningClasses.add(pkg + "JGroupsStrings");
StringIdDefiningClasses.add("com.gemstone.gemfire.management.internal.ManagementStrings");
return StringIdDefiningClasses;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a35cca36/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
old mode 100755
new mode 100644
index f356bda..03746c1
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -124,7 +124,7 @@ com/gemstone/gemfire/cache/client/SubscriptionNotEnabledException,true,-82124467
com/gemstone/gemfire/cache/client/internal/ContainsKeyOp$MODE,false
com/gemstone/gemfire/cache/client/internal/TXSynchronizationOp$CompletionType,false
com/gemstone/gemfire/cache/client/internal/pooling/ConnectionDestroyedException,true,-6918516787578041316
-com/gemstone/gemfire/cache/execute/EmptyRegionFunctionException,true,1
+com/gemstone/gemfire/cache/execute/EmtpyRegionFunctionException,true,1
com/gemstone/gemfire/cache/execute/FunctionAdapter,false
com/gemstone/gemfire/cache/execute/FunctionException,true,4893171227542647452
com/gemstone/gemfire/cache/execute/FunctionInvocationTargetException,true,1,id:com/gemstone/gemfire/distributed/DistributedMember