geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [geode] branch whitelist_wip updated: whitelist WIP
Date Tue, 21 Nov 2017 00:02:11 GMT
This is an automated email from the ASF dual-hosted git repository.

bschuchardt pushed a commit to branch whitelist_wip
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/whitelist_wip by this push:
     new 969ec5e  whitelist WIP
969ec5e is described below

commit 969ec5eb34729fd6dfc45c7cfcedb1480a99c1ab
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
AuthorDate: Mon Nov 20 16:01:10 2017 -0800

    whitelist WIP
    
    Fixing whitelists for a couple more FlakyTest tests & cleaning up
    formatting violations.
---
 .../cache/query/dunit/QueryUsingFunctionContextDUnitTest.java      | 4 ++--
 .../cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java      | 7 +++----
 .../geode/management/internal/cli/commands/CliCommandTestBase.java | 2 +-
 .../internal/cli/commands/GemfireDataCommandsDUnitTest.java        | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index 673573d..94fa482 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -861,8 +861,8 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase
{
   private void createCacheClientWithoutReg(String host, Integer port1, Integer port2,
       Integer port3) {
     this.disconnectFromDS();
-    ClientCache cache = new ClientCacheFactory(getDistributedSystemProperties()).addPoolServer(host,
port1)
-        .addPoolServer(host, port2).addPoolServer(host, port3).create();
+    ClientCache cache = new ClientCacheFactory(getDistributedSystemProperties())
+        .addPoolServer(host, port1).addPoolServer(host, port2).addPoolServer(host, port3).create();
   }
 
   /**
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index 60064ed..4f62d81 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -113,8 +113,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
   @Override
   public Properties getDistributedSystemProperties() {
     Properties properties = super.getDistributedSystemProperties();
-    properties.put(ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER,
-        "parReg.query.unittest.**");
+    properties.put(ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER, "parReg.query.unittest.**");
     return properties;
   }
 
@@ -1554,6 +1553,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
     LogWriterUtils.getLogWriter()
         .info("PRQBasicQueryDUnitTest#testPRBasicQuerying: Querying PR's Test ENDED");
   }
+
   // Helper classes and function
   static public class TestQueryFunction extends FunctionAdapter implements DataSerializable
{
 
@@ -1585,8 +1585,7 @@ public class PRColocatedEquiJoinDUnitTest extends PartitionedRegionDUnitTestCase
       try {
         Query query = queryService.newQuery(qstr);
         context.getResultSender().sendResult(
-            (ArrayList) ((SelectResults) query.execute((RegionFunctionContext) context))
-                .asList());
+            (ArrayList) ((SelectResults) query.execute((RegionFunctionContext) context)).asList());
         context.getResultSender().lastResult(null);
       } catch (Exception e) {
         e.printStackTrace();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
index 20314fa..93e5cd1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
@@ -155,7 +155,7 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
   protected Object[] setUpJMXManagerOnVM(int vm, final Properties props, String jsonFile)
{
     Object[] result = Host.getHost(0).getVM(vm).invoke("setUpJmxManagerOnVm" + vm, () ->
{
       final Object[] results = new Object[3];
-      final Properties localProps = (props != null ? props : new Properties());
+      final Properties localProps = (props != null ? props : getDistributedSystemProperties());
 
       try {
         this.jmxHost = InetAddress.getLocalHost().getHostName();
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 95251fb..0c27ed4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -155,7 +155,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
   void setupForGetPutRemoveLocateEntry(String testName) {
     final VM vm1 = Host.getHost(0).getVM(1);
     final VM vm2 = Host.getHost(0).getVM(2);
-    Properties props = new Properties();
+    Properties props = getDistributedSystemProperties();
     props.setProperty(NAME, testName + "Manager");
     HeadlessGfsh gfsh = setUpJmxManagerOnVm0ThenConnect(props);
     assertNotNull(gfsh);

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].

Mime
View raw message