You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/06/09 06:02:07 UTC
[skywalking] branch master updated: Remove unstable tests (#2841)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new e05e092 Remove unstable tests (#2841)
e05e092 is described below
commit e05e09267722a19e366ebc0946f4d12840eec512
Author: kezhenxu94 <ke...@163.com>
AuthorDate: Sun Jun 9 14:02:01 2019 +0800
Remove unstable tests (#2841)
---
.../configuration-nacos/pom.xml | 94 ----------------------
.../nacos/ITNacosConfigurationTest.java | 2 +
2 files changed, 2 insertions(+), 94 deletions(-)
diff --git a/oap-server/server-configuration/configuration-nacos/pom.xml b/oap-server/server-configuration/configuration-nacos/pom.xml
index 8c8816d..207ed8f 100644
--- a/oap-server/server-configuration/configuration-nacos/pom.xml
+++ b/oap-server/server-configuration/configuration-nacos/pom.xml
@@ -45,98 +45,4 @@
<artifactId>nacos-client</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <configuration>
- <sourceMode>all</sourceMode>
- <showLogs>true</showLogs>
- <logDate>default</logDate>
- <verbose>true</verbose>
- <imagePullPolicy>Always</imagePullPolicy>
- <autoCreateCustomNetworks>true</autoCreateCustomNetworks>
- <images>
- <image>
- <name>mysql:5.7</name>
- <alias>nacos-dynamic-configuration-integration-test-mysql</alias>
- <run>
- <network>
- <name>test-network</name>
- <alias>mysql</alias>
- </network>
- <env>
- <MYSQL_MASTER_SERVICE_HOST>127.0.0.1</MYSQL_MASTER_SERVICE_HOST>
- <MYSQL_ALLOW_EMPTY_PASSWORD>yes</MYSQL_ALLOW_EMPTY_PASSWORD>
- </env>
- <namingStrategy>none</namingStrategy>
- <ports>
- <port>3307:3306</port>
- </ports>
- <volumes>
- <bind>
- <volume>
- src/test/resources/docker/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
- </volume>
- </bind>
- </volumes>
- <wait>
- <log>ready for connections</log>
- <time>30000</time>
- </wait>
- </run>
- </image>
- <image>
- <name>nacos/nacos-server:${nacos.version}</name>
- <alias>nacos-dynamic-configuration-integration-test-nacos</alias>
- <run>
- <network>
- <name>test-network</name>
- <alias>nacos</alias>
- </network>
- <env>
- <MODE>standalone</MODE>
- <MYSQL_MASTER_SERVICE_HOST>mysql</MYSQL_MASTER_SERVICE_HOST>
- <MYSQL_MASTER_SERVICE_DB_NAME>test</MYSQL_MASTER_SERVICE_DB_NAME>
- <MYSQL_MASTER_SERVICE_PORT>3307</MYSQL_MASTER_SERVICE_PORT>
- </env>
- <namingStrategy>none</namingStrategy>
- <dependsOn>
- <container>nacos-dynamic-configuration-integration-test-mysql</container>
- </dependsOn>
- <links>
- <link>nacos-dynamic-configuration-integration-test-mysql</link>
- </links>
- <ports>
- <port>8848:8848</port>
- </ports>
- <wait>
- <log>Nacos started successfully</log>
- <time>60000</time>
- </wait>
- </run>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java
index 97f711e..cab8991 100644
--- a/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java
+++ b/oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java
@@ -27,6 +27,7 @@ import org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.library.util.ResourceUtils;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.yaml.snakeyaml.Yaml;
@@ -62,6 +63,7 @@ public class ITNacosConfigurationTest {
}
@SuppressWarnings("StatementWithEmptyBody")
+ @Ignore // because of instability
@Test(timeout = 10000)
public void shouldReadUpdated() throws NacosException {
assertNull(provider.watcher.value());