Repository: ignite Updated Branches: refs/heads/ignite-comm-balance 2b25194c2 -> 101f9845c
IGNITE-3988: Moved failing cloud tests to ignore module. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/474ade27 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/474ade27 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/474ade27 Branch: refs/heads/ignite-comm-balance Commit: 474ade276c4ae3e8f93cce37473d37270b4e7ad9 Parents: 89c30c8 Author: vozerov-gridgain <[email protected]> Authored: Wed Sep 28 14:38:04 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Sep 28 14:38:04 2016 +0300 ---------------------------------------------------------------------- .../cloud/TcpDiscoveryCloudIpFinderSelfTest.java | 6 ++++-- .../ignite/testsuites/IgniteCloudTestSuite.java | 5 +++-- modules/ignored-tests/pom.xml | 14 ++++++++++++++ .../ignite/testsuites/IgniteIgnoredTestSuite.java | 3 +++ 4 files changed, 24 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/474ade27/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java index bf0cbd5..4bddb18 100644 --- a/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java +++ b/modules/cloud/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/cloud/TcpDiscoveryCloudIpFinderSelfTest.java @@ -20,9 +20,11 @@ package org.apache.ignite.spi.discovery.tcp.ipfinder.cloud; import com.google.common.collect.ImmutableList; import java.net.InetSocketAddress; import java.util.Collection; + import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAbstractSelfTest; import org.apache.ignite.testsuites.IgniteCloudTestSuite; +import org.apache.ignite.testsuites.IgniteIgnore; /** * TcpDiscoveryCloudIpFinder test. @@ -58,6 +60,7 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends * * @throws Exception If any error occurs. */ + @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-845";) public void testAmazonWebServices() throws Exception { testCloudProvider("aws-ec2"); } @@ -67,9 +70,8 @@ public class TcpDiscoveryCloudIpFinderSelfTest extends * * @throws Exception If any error occurs. */ + @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-1585";) public void testGoogleComputeEngine() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1585";); - testCloudProvider("google-compute-engine"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/474ade27/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java b/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java index 12a67e7..632cddc 100644 --- a/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java +++ b/modules/cloud/src/test/java/org/apache/ignite/testsuites/IgniteCloudTestSuite.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.LinkedList; import junit.framework.TestSuite; import org.apache.ignite.spi.discovery.tcp.ipfinder.cloud.TcpDiscoveryCloudIpFinderSelfTest; +import org.apache.ignite.testframework.IgniteTestSuite; /** * Ignite Cloud integration test. @@ -31,10 +32,10 @@ public class IgniteCloudTestSuite extends TestSuite { * @throws Exception Thrown in case of the failure. */ public static TestSuite suite() throws Exception { - TestSuite suite = new TestSuite("Cloud Integration Test Suite"); + TestSuite suite = new IgniteTestSuite("Cloud Integration Test Suite"); // Cloud Nodes IP finder. - suite.addTest(new TestSuite(TcpDiscoveryCloudIpFinderSelfTest.class)); + suite.addTestSuite(TcpDiscoveryCloudIpFinderSelfTest.class); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/474ade27/modules/ignored-tests/pom.xml ---------------------------------------------------------------------- diff --git a/modules/ignored-tests/pom.xml b/modules/ignored-tests/pom.xml index cfeacb2..9fdff2c 100644 --- a/modules/ignored-tests/pom.xml +++ b/modules/ignored-tests/pom.xml @@ -78,6 +78,20 @@ <dependency> <groupId>org.apache.ignite</groupId> + <artifactId>ignite-cloud</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-cloud</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> <artifactId>ignite-web</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/474ade27/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java b/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java index fa60721..3ab1d7f 100644 --- a/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java +++ b/modules/ignored-tests/src/test/java/org/apache/ignite/testsuites/IgniteIgnoredTestSuite.java @@ -37,6 +37,9 @@ public class IgniteIgnoredTestSuite extends TestSuite { /* --- AWS --- */ suite.addTest(IgniteS3TestSuite.suite()); + /* --- CLOUDS --- */ + suite.addTest(IgniteCloudTestSuite.suite()); + /* --- WEB SESSIONS --- */ suite.addTest(IgniteWebSessionSelfTestSuite.suite());
