This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch enable_tests2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d2acf0337d27f6ca626e55b7a8832258c890b11a Author: HTHou <[email protected]> AuthorDate: Thu Dec 1 13:16:58 2022 +0800 Revert "Revert "[To rel/1.0] Enable tests after v1.0.0 released (#8272)"" This reverts commit 942bedaca8db80bae593927ffd9f457a48e84f13. --- confignode/pom.xml | 2 +- consensus/pom.xml | 2 +- cross-tests/pom.xml | 2 +- integration-test/pom.xml | 212 +++++++++++++++++++++++------------------------ integration/pom.xml | 20 +---- pom.xml | 2 +- server/pom.xml | 2 +- testcontainer/pom.xml | 2 +- tsfile/pom.xml | 2 +- 9 files changed, 115 insertions(+), 131 deletions(-) diff --git a/confignode/pom.xml b/confignode/pom.xml index c39f7bb3a0..f24c883113 100644 --- a/confignode/pom.xml +++ b/confignode/pom.xml @@ -30,7 +30,7 @@ <artifactId>iotdb-confignode</artifactId> <name>IoTDB ConfigNode</name> <properties> - <confignode.test.skip>true</confignode.test.skip> + <confignode.test.skip>false</confignode.test.skip> <confignode.it.skip>${confignode.test.skip}</confignode.it.skip> <confignode.ut.skip>${confignode.test.skip}</confignode.ut.skip> </properties> diff --git a/consensus/pom.xml b/consensus/pom.xml index 1437b0374f..7a39c31627 100644 --- a/consensus/pom.xml +++ b/consensus/pom.xml @@ -33,7 +33,7 @@ <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> <ratis.version>2.4.1</ratis.version> - <consensus.test.skip>true</consensus.test.skip> + <consensus.test.skip>false</consensus.test.skip> <consensus.it.skip>${consensus.test.skip}</consensus.it.skip> <consensus.ut.skip>${consensus.test.skip}</consensus.ut.skip> </properties> diff --git a/cross-tests/pom.xml b/cross-tests/pom.xml index c4e68359b8..6edc9e1690 100644 --- a/cross-tests/pom.xml +++ b/cross-tests/pom.xml @@ -28,7 +28,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>cross-tests</artifactId> <properties> - <cross.test.test.skip>true</cross.test.test.skip> + <cross.test.test.skip>false</cross.test.test.skip> <cross.test.it.skip>${cross.test.test.skip}</cross.test.it.skip> <cross.ut.skip>${cross.test.test.skip}</cross.ut.skip> </properties> diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 1b5addb22a..e5e1387374 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -95,112 +95,112 @@ <build> <plugins> <!-- skip default-test --> -<!-- <plugin>--> -<!-- <groupId>org.apache.maven.plugins</groupId>--> -<!-- <artifactId>maven-surefire-plugin</artifactId>--> -<!-- <executions>--> -<!-- <execution>--> -<!-- <id>default-test</id>--> -<!-- <configuration>--> -<!-- <skip>true</skip>--> -<!-- </configuration>--> -<!-- </execution>--> -<!-- </executions>--> -<!-- </plugin>--> -<!-- <!– If the test starts separate processes, we should package first –>--> -<!-- <plugin>--> -<!-- <groupId>org.apache.maven.plugins</groupId>--> -<!-- <artifactId>maven-assembly-plugin</artifactId>--> -<!-- <version>${maven.assembly.version}</version>--> -<!-- <configuration>--> -<!-- <skipAssembly>${integrationTest.launchNodeInSameJVM}</skipAssembly>--> -<!-- </configuration>--> -<!-- <executions>--> -<!-- <!– Package binaries–>--> -<!-- <execution>--> -<!-- <id>cluster-test-assembly</id>--> -<!-- <phase>package</phase>--> -<!-- <goals>--> -<!-- <goal>single</goal>--> -<!-- </goals>--> -<!-- <configuration>--> -<!-- <descriptors>--> -<!-- <descriptor>src/assembly/mpp-test.xml</descriptor>--> -<!-- </descriptors>--> -<!-- <finalName>template-node</finalName>--> -<!-- <appendAssemblyId>false</appendAssemblyId>--> -<!-- </configuration>--> -<!-- </execution>--> -<!-- <execution>--> -<!-- <id>cluster-test-assembly-share</id>--> -<!-- <phase>package</phase>--> -<!-- <goals>--> -<!-- <goal>single</goal>--> -<!-- </goals>--> -<!-- <configuration>--> -<!-- <descriptors>--> -<!-- <descriptor>src/assembly/mpp-share.xml</descriptor>--> -<!-- </descriptors>--> -<!-- <finalName>template-node-share</finalName>--> -<!-- <appendAssemblyId>false</appendAssemblyId>--> -<!-- </configuration>--> -<!-- </execution>--> -<!-- </executions>--> -<!-- </plugin>--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>default-test</id> + <configuration> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + <!-- If the test starts separate processes, we should package first --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven.assembly.version}</version> + <configuration> + <skipAssembly>${integrationTest.launchNodeInSameJVM}</skipAssembly> + </configuration> + <executions> + <!-- Package binaries--> + <execution> + <id>cluster-test-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/mpp-test.xml</descriptor> + </descriptors> + <finalName>template-node</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>cluster-test-assembly-share</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assembly/mpp-share.xml</descriptor> + </descriptors> + <finalName>template-node-share</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> <!-- Run integration tests --> -<!-- <plugin>--> -<!-- <groupId>org.apache.maven.plugins</groupId>--> -<!-- <artifactId>maven-failsafe-plugin</artifactId>--> -<!-- <executions>--> -<!-- <execution>--> -<!-- <id>integration-test</id>--> -<!-- <goals>--> -<!-- <goal>integration-test</goal>--> -<!-- </goals>--> -<!-- <configuration>--> -<!-- <groups>${integrationTest.includedGroups}</groups>--> -<!-- <excludedGroups>${integrationTest.excludedGroups}</excludedGroups>--> -<!-- <useSystemClassLoader>false</useSystemClassLoader>--> -<!-- <parallel>${integrationTest.parallelMode}</parallel>--> -<!-- <threadCount>1</threadCount>--> -<!-- <forkCount>${integrationTest.forkCount}</forkCount>--> -<!-- <reuseForks>false</reuseForks>--> -<!-- <systemPropertyVariables>--> -<!-- <TestEnv>${integrationTest.testEnv}</TestEnv>--> -<!-- <RandomSelectWriteNode>${integrationTest.randomSelectWriteNode}</RandomSelectWriteNode>--> -<!-- <ReadAndVerifyWithMultiNode>${integrationTest.readAndVerifyWithMultiNode}</ReadAndVerifyWithMultiNode>--> -<!-- </systemPropertyVariables>--> -<!-- <summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile>--> -<!-- </configuration>--> -<!-- </execution>--> -<!-- <execution>--> -<!-- <id>verify</id>--> -<!-- <goals>--> -<!-- <goal>verify</goal>--> -<!-- </goals>--> -<!-- <configuration>--> -<!-- <skipTests>true</skipTests>--> -<!-- </configuration>--> -<!-- </execution>--> -<!-- </executions>--> -<!-- </plugin>--> -<!-- <plugin>--> -<!-- <groupId>org.codehaus.mojo</groupId>--> -<!-- <artifactId>exec-maven-plugin</artifactId>--> -<!-- <version>1.6.0</version>--> -<!-- <configuration>--> -<!-- <mainClass>org.apache.iotdb.it.framework.IoTDBTestReporter</mainClass>--> -<!-- </configuration>--> -<!-- <executions>--> -<!-- <execution>--> -<!-- <id>report</id>--> -<!-- <phase>post-integration-test</phase>--> -<!-- <goals>--> -<!-- <goal>java</goal>--> -<!-- </goals>--> -<!-- </execution>--> -<!-- </executions>--> -<!-- </plugin>--> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + </goals> + <configuration> + <groups>${integrationTest.includedGroups}</groups> + <excludedGroups>${integrationTest.excludedGroups}</excludedGroups> + <useSystemClassLoader>false</useSystemClassLoader> + <parallel>${integrationTest.parallelMode}</parallel> + <threadCount>1</threadCount> + <forkCount>${integrationTest.forkCount}</forkCount> + <reuseForks>false</reuseForks> + <systemPropertyVariables> + <TestEnv>${integrationTest.testEnv}</TestEnv> + <RandomSelectWriteNode>${integrationTest.randomSelectWriteNode}</RandomSelectWriteNode> + <ReadAndVerifyWithMultiNode>${integrationTest.readAndVerifyWithMultiNode}</ReadAndVerifyWithMultiNode> + </systemPropertyVariables> + <summaryFile>target/failsafe-reports/failsafe-summary-IT.xml</summaryFile> + </configuration> + </execution> + <execution> + <id>verify</id> + <goals> + <goal>verify</goal> + </goals> + <configuration> + <skipTests>false</skipTests> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.6.0</version> + <configuration> + <mainClass>org.apache.iotdb.it.framework.IoTDBTestReporter</mainClass> + </configuration> + <executions> + <execution> + <id>report</id> + <phase>post-integration-test</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -216,7 +216,7 @@ <integrationTest.parallelMode>classes</integrationTest.parallelMode> </properties> <activation> - <activeByDefault>false</activeByDefault> + <activeByDefault>true</activeByDefault> </activation> </profile> <!-- Currently RemoteIT is not working as it lacks of the remote endpoint parameters --> diff --git a/integration/pom.xml b/integration/pom.xml index e77c15a9cd..a11052a101 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -105,14 +105,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - <skipITs>true</skipITs> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> @@ -185,7 +177,7 @@ <goal>integration-test</goal> </goals> <configuration> - <skipTests>true</skipTests> + <skipTests>false</skipTests> <groups>${test.includedGroups}</groups> <excludedGroups>${test.excludedGroups}</excludedGroups> <useSystemClassLoader>false</useSystemClassLoader> @@ -204,7 +196,7 @@ <goal>verify</goal> </goals> <configuration> - <skipTests>true</skipTests> + <skipTests>false</skipTests> <summaryFiles> <summaryFile>target/failsafe-reports/failsafe-summary-Remote.xml</summaryFile> </summaryFiles> @@ -261,14 +253,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - <skipITs>true</skipITs> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> diff --git a/pom.xml b/pom.xml index b2b08361cf..7b20282b23 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ <module>client-cpp</module> <module>metrics</module> <module>integration</module> - <!-- <module>integration-test</module>--> + <module>integration-test</module> <module>consensus</module> <module>external-pipe-api</module> <module>library-udf</module> diff --git a/server/pom.xml b/server/pom.xml index 0b9180a489..29924af52a 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -30,7 +30,7 @@ <artifactId>iotdb-server</artifactId> <name>IoTDB Server</name> <properties> - <iotdb.test.skip>true</iotdb.test.skip> + <iotdb.test.skip>false</iotdb.test.skip> <iotdb.it.skip>${iotdb.test.skip}</iotdb.it.skip> <iotdb.ut.skip>${iotdb.test.skip}</iotdb.ut.skip> <jjwt-api.version>0.10.8</jjwt-api.version> diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml index 2754941590..be1e02620b 100644 --- a/testcontainer/pom.xml +++ b/testcontainer/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/tsfile/pom.xml b/tsfile/pom.xml index 9eb4cd8e55..a5a7d4b06c 100644 --- a/tsfile/pom.xml +++ b/tsfile/pom.xml @@ -32,7 +32,7 @@ <description>A columnar file format designed for time-series data</description> <url>https://github.com/thulab/iotdb/tree/master/tsfile</url> <properties> - <tsfile.test.skip>true</tsfile.test.skip> + <tsfile.test.skip>false</tsfile.test.skip> <tsfile.it.skip>${tsfile.test.skip}</tsfile.it.skip> <tsfile.ut.skip>${tsfile.test.skip}</tsfile.ut.skip> </properties>
