kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unstable tests (#2841)

This commit is contained in:
kezhenxu94 2019-06-09 14:02:01 +08:00 committed by 吴晟 Wu Sheng
parent 2197820577
commit e05e092677
2 changed files with 2 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
oap-server/server-configuration/configuration-nacos/pom.xml
View File

@ -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>

2
oap-server/server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/ITNacosConfigurationTest.java
View File

@ -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());