You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/09/13 19:11:49 UTC
[02/50] [abbrv] incubator-geode git commit: GEODE-420: fixing tests
GEODE-420: fixing tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/31cbd2f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/31cbd2f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/31cbd2f2
Branch: refs/heads/develop
Commit: 31cbd2f2b7bcf423656e1962df8e58e913f20492
Parents: 887f1df
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Aug 16 15:08:05 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Aug 16 15:08:05 2016 +1000
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java | 5 +++++
.../java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java | 4 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31cbd2f2/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 323bc5c..9fe4e8f 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
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
+import com.sun.xml.internal.ws.api.FeatureListValidatorAnnotation;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -69,6 +70,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.FlakyTest;
import com.gemstone.gemfire.util.test.TestUtil;
/**
@@ -434,6 +436,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
@Test
+ @Category(FlakyTest.class)
public void testStartTwoLocatorsOneWithSSLAndTheOtherNonSSL() throws Exception {
SocketCreatorFactory.close();
IgnoredException expectedException = IgnoredException.addIgnoredException("Unrecognized SSL message, plaintext connection");
@@ -493,6 +496,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
@Test
+ @Category(FlakyTest.class)
public void testStartTwoLocatorsOneWithNonSSLAndTheOtherSSL() throws Exception {
SocketCreatorFactory.close();
IgnoredException expectedException = IgnoredException.addIgnoredException("Remote host closed connection during handshake");
@@ -546,6 +550,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
@Test
+ @Category(FlakyTest.class)
public void testStartTwoLocatorsWithDifferentSSLCertificates() throws Exception {
SocketCreatorFactory.close();
IgnoredException expectedException = IgnoredException.addIgnoredException("Remote host closed connection during handshake");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31cbd2f2/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
index 1b2115e..786d405 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/JMXMBeanDUnitTest.java
@@ -38,6 +38,7 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import com.gemstone.gemfire.distributed.AbstractLauncher;
import com.gemstone.gemfire.distributed.LocatorLauncher;
@@ -51,6 +52,7 @@ import com.gemstone.gemfire.test.dunit.Invoke;
import com.gemstone.gemfire.test.dunit.NetworkUtils;
import com.gemstone.gemfire.test.dunit.VM;
import com.gemstone.gemfire.test.dunit.rules.DistributedRestoreSystemProperties;
+import com.gemstone.gemfire.test.junit.categories.FlakyTest;
import com.gemstone.gemfire.test.junit.rules.serializable.SerializableTemporaryFolder;
import com.gemstone.gemfire.util.test.TestUtil;
@@ -149,7 +151,7 @@ public class JMXMBeanDUnitTest extends DistributedTestCase {
}
@Test
- @Ignore
+ @Category(FlakyTest.class)
//To be fixed in GEODE-1716
public void testJMXOverNonSSL() throws Exception {
locator.invoke("Configure and start Locator", () -> {