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/12/13 02:03:03 UTC

[1/2] geode git commit: GEODE-209: disable broken test until race condition is fixed

Repository: geode
Updated Branches:
  refs/heads/develop c10a788b1 -> e81ad7c64


GEODE-209: disable broken test until race condition is fixed


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c48a350e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c48a350e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c48a350e

Branch: refs/heads/develop
Commit: c48a350e33f4f74cf551ccba119436113bfc8bb2
Parents: c10a788
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Dec 12 17:45:14 2016 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Dec 12 17:45:14 2016 -0800

----------------------------------------------------------------------
 .../golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java   | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/c48a350e/geode-core/src/test/java/org/apache/geode/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java
index 67798f2..eff4234 100755
--- a/geode-core/src/test/java/org/apache/geode/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java
@@ -16,9 +16,11 @@ package org.apache.geode.test.golden;
 
 import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.process.ProcessWrapper;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
@@ -46,6 +48,8 @@ public class FailWithTimeoutOfWaitForOutputToMatchJUnitTest extends FailOutputTe
   /**
    * Process output has an extra line and should fail
    */
+  @Category(FlakyTest.class) // GEODE-209
+  @Ignore // cause of GEODE-209 is process.destroy() closes the stream
   @Test
   public void testFailWithTimeoutOfWaitForOutputToMatch() throws Exception {
     this.process =


[2/2] geode git commit: GEODE-1977: add FlakyTest category to flaky test

Posted by kl...@apache.org.
GEODE-1977: add FlakyTest category to flaky test


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/e81ad7c6
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/e81ad7c6
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/e81ad7c6

Branch: refs/heads/develop
Commit: e81ad7c64a16fef1800dfa9b96adc013a2e44797
Parents: c48a350
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Dec 12 18:02:47 2016 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Dec 12 18:02:47 2016 -0800

----------------------------------------------------------------------
 .../org/apache/geode/security/SecurityClusterConfigDUnitTest.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/e81ad7c6/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
index cd6518e..10b12e5 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
@@ -32,6 +32,7 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
 import org.apache.geode.test.dunit.rules.ServerStarterRule;
 import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -62,6 +63,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase {
     lsRule.startLocatorVM(0, props);
   }
 
+  @Category(FlakyTest.class) // GEODE-1977
   @Test
   public void testStartServerWithClusterConfig() throws Exception {
     Properties props = new Properties();