You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2017/09/29 18:47:46 UTC

[geode] branch develop updated: GEODE-3721: Renabling durable client tests that were ignored (#840)

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/develop by this push:
     new 3b6ba91  GEODE-3721: Renabling durable client tests that were ignored (#840)
3b6ba91 is described below

commit 3b6ba915a27d8515cbbb98dcf8456cce56f2c29b
Author: Dan Smith <ds...@pivotal.io>
AuthorDate: Fri Sep 29 11:47:44 2017 -0700

    GEODE-3721: Renabling durable client tests that were ignored (#840)
    
    GEODE-3721: Renabling durable client tests that were ignored
    
    These tests were marked ignored referencing some pre-geode bug.
    Reenabling them. The tests are not failing for me.
---
 .../cache/tier/sockets/DurableClientTestCase.java     | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
index 5533376..6d94a17 100755
--- a/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/org/apache/geode/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -1081,14 +1081,12 @@ public class DurableClientTestCase extends JUnit4DistributedTestCase {
     });
   }
 
-  @Ignore("TODO: This test is failing inconsistently, see bug 51258")
   @Test
   public void testDurableNonHAFailover() throws InterruptedException {
     durableFailover(0);
     durableFailoverAfterReconnect(0);
   }
 
-  @Ignore("TODO: This test is failing inconsistently, see bug 51258")
   @Test
   public void testDurableHAFailover() throws InterruptedException {
     // Clients see this when the servers disconnect
@@ -1269,21 +1267,14 @@ public class DurableClientTestCase extends JUnit4DistributedTestCase {
 
 
   public void durableFailoverAfterReconnect(int redundancyLevel) {
-
-
     // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(
-        () -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, new Boolean(true))));
+    Integer[] ports = ((Integer[]) this.server1VM
+        .invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, true)));
     final int server1Port = ports[0].intValue();
-    final int mcastPort = ports[1].intValue();
 
-    // Start server 2 using the same mcast port as server 1
-    fail("Trying to get a result from a void method");
-    final int server2Port = 0;
-    // final int server2Port = ((Integer) this.server2VM.invoke(() ->
-    // CacheServerTestUtil.createCacheServer(regionName, new Boolean(true), new
-    // Integer(mcastPort))))
-    // .intValue();
+    ports = this.server2VM
+        .invoke(() -> CacheServerTestUtil.createCacheServerReturnPorts(regionName, true));
+    int server2Port = ports[0];
 
     // Start a durable client
     final String durableClientId = getName() + "_client";

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