You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by eo...@apache.org on 2022/06/11 11:57:18 UTC
[pulsar] branch master updated: [cleanup][pom] Remove unused TestNG conf files and clean up repeated notes (#16004)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 6114234c569 [cleanup][pom] Remove unused TestNG conf files and clean up repeated notes (#16004)
6114234c569 is described below
commit 6114234c5694b69eb587b9866a5a0de5ecf926cd
Author: tison <wa...@gmail.com>
AuthorDate: Sat Jun 11 19:57:11 2022 +0800
[cleanup][pom] Remove unused TestNG conf files and clean up repeated notes (#16004)
Signed-off-by: tison <wa...@gmail.com>
---
build/run_integration_group.sh | 2 +-
tests/bc_2_0_0/src/test/resources/pulsar.xml | 2 --
tests/bc_2_0_1/src/test/resources/pulsar.xml | 2 --
.../src/test/resources/backwards-client.xml | 2 --
.../src/test/resources/pulsar-cli-suite.xml | 28 ----------------------
.../src/test/resources/pulsar-process-suite.xml | 28 ----------------------
.../src/test/resources/pulsar-schema-suite.xml | 28 ----------------------
.../src/test/resources/pulsar-sql-suite.xml | 28 ----------------------
.../src/test/resources/pulsar-thread-suite.xml | 28 ----------------------
tests/integration/src/test/resources/pulsar.xml | 2 --
.../test/resources/tiered-file-system-suite.xml | 28 ----------------------
.../test/resources/tiered-storage-jcloud-suite.xml | 28 ----------------------
.../src/test/resources/pulsar.xml | 2 --
.../src/test/resources/pulsar.xml | 2 --
.../src/test/resources/pulsar.xml | 2 --
15 files changed, 1 insertion(+), 211 deletions(-)
diff --git a/build/run_integration_group.sh b/build/run_integration_group.sh
index 758676805ec..b86b0a861cd 100755
--- a/build/run_integration_group.sh
+++ b/build/run_integration_group.sh
@@ -173,7 +173,7 @@ test_group_pulsar_connectors_process() {
# run integration source
mvn_run_integration_test --retry --skip-build-deps "$@" -DintegrationTestSuiteFile=pulsar-process.xml -DintegrationTests -Dgroups=source
- # run integraion sink
+ # run integration sink
mvn_run_integration_test --retry --skip-build-deps "$@" -DintegrationTestSuiteFile=pulsar-process.xml -DintegrationTests -Dgroups=sink
}
diff --git a/tests/bc_2_0_0/src/test/resources/pulsar.xml b/tests/bc_2_0_0/src/test/resources/pulsar.xml
index 4b2a9bcb5da..43dfaea1581 100644
--- a/tests/bc_2_0_0/src/test/resources/pulsar.xml
+++ b/tests/bc_2_0_0/src/test/resources/pulsar.xml
@@ -19,8 +19,6 @@
-->
<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Standalone Tests" verbose="2" annotations="JDK">
<test name="pulsar-standalone-suite" preserve-order="true" >
<classes>
diff --git a/tests/bc_2_0_1/src/test/resources/pulsar.xml b/tests/bc_2_0_1/src/test/resources/pulsar.xml
index 4b2a9bcb5da..43dfaea1581 100644
--- a/tests/bc_2_0_1/src/test/resources/pulsar.xml
+++ b/tests/bc_2_0_1/src/test/resources/pulsar.xml
@@ -19,8 +19,6 @@
-->
<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Standalone Tests" verbose="2" annotations="JDK">
<test name="pulsar-standalone-suite" preserve-order="true" >
<classes>
diff --git a/tests/bc_2_6_0/src/test/resources/backwards-client.xml b/tests/bc_2_6_0/src/test/resources/backwards-client.xml
index 4b2a9bcb5da..43dfaea1581 100644
--- a/tests/bc_2_6_0/src/test/resources/backwards-client.xml
+++ b/tests/bc_2_6_0/src/test/resources/backwards-client.xml
@@ -19,8 +19,6 @@
-->
<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Standalone Tests" verbose="2" annotations="JDK">
<test name="pulsar-standalone-suite" preserve-order="true" >
<classes>
diff --git a/tests/integration/src/test/resources/pulsar-cli-suite.xml b/tests/integration/src/test/resources/pulsar-cli-suite.xml
deleted file mode 100644
index ec07208a858..00000000000
--- a/tests/integration/src/test/resources/pulsar-cli-suite.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
-<suite name="Pulsar Test Suite" parallel="instances" thread-count="1">
- <suite-files>
- <suite-file path="./pulsar-cli.xml" />
- </suite-files>
-</suite>
diff --git a/tests/integration/src/test/resources/pulsar-process-suite.xml b/tests/integration/src/test/resources/pulsar-process-suite.xml
deleted file mode 100644
index 5c65e2d7eeb..00000000000
--- a/tests/integration/src/test/resources/pulsar-process-suite.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
-<suite name="Pulsar Test Suite" parallel="instances" thread-count="1">
- <suite-files>
- <suite-file path="./pulsar-process.xml" />
- </suite-files>
-</suite>
diff --git a/tests/integration/src/test/resources/pulsar-schema-suite.xml b/tests/integration/src/test/resources/pulsar-schema-suite.xml
deleted file mode 100644
index ed0a003a0bb..00000000000
--- a/tests/integration/src/test/resources/pulsar-schema-suite.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
-<suite name="Pulsar Test Suite" parallel="instances" thread-count="1">
- <suite-files>
- <suite-file path="./pulsar-schema.xml" />
- </suite-files>
-</suite>
diff --git a/tests/integration/src/test/resources/pulsar-sql-suite.xml b/tests/integration/src/test/resources/pulsar-sql-suite.xml
deleted file mode 100644
index 78b6268bc34..00000000000
--- a/tests/integration/src/test/resources/pulsar-sql-suite.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
-<suite name="Pulsar Test Suite" parallel="instances" thread-count="1">
- <suite-files>
- <suite-file path="./pulsar-sql.xml" />
- </suite-files>
-</suite>
diff --git a/tests/integration/src/test/resources/pulsar-thread-suite.xml b/tests/integration/src/test/resources/pulsar-thread-suite.xml
deleted file mode 100644
index 00f7220b7cf..00000000000
--- a/tests/integration/src/test/resources/pulsar-thread-suite.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
-<suite name="Pulsar Test Suite" parallel="instances" thread-count="1">
- <suite-files>
- <suite-file path="./pulsar-thread.xml" />
- </suite-files>
-</suite>
diff --git a/tests/integration/src/test/resources/pulsar.xml b/tests/integration/src/test/resources/pulsar.xml
index 5382d9b5f5b..7fbe9fa24d8 100644
--- a/tests/integration/src/test/resources/pulsar.xml
+++ b/tests/integration/src/test/resources/pulsar.xml
@@ -19,8 +19,6 @@
-->
<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Test Suite" parallel="instances" thread-count="1">
<suite-files>
<suite-file path="./pulsar-cli.xml" />
diff --git a/tests/integration/src/test/resources/tiered-file-system-suite.xml b/tests/integration/src/test/resources/tiered-file-system-suite.xml
deleted file mode 100644
index 46c2c3587d3..00000000000
--- a/tests/integration/src/test/resources/tiered-file-system-suite.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
-<suite name="Pulsar (Jcloud Tiered Storage)Test Suite" parallel="instances" thread-count="1">
- <suite-files>
- <suite-file path="./tiered-filesystem-storage.xml" />
- </suite-files>
-</suite>
diff --git a/tests/integration/src/test/resources/tiered-storage-jcloud-suite.xml b/tests/integration/src/test/resources/tiered-storage-jcloud-suite.xml
deleted file mode 100644
index be7fa982fb7..00000000000
--- a/tests/integration/src/test/resources/tiered-storage-jcloud-suite.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
-<suite name="Pulsar Test Suite" parallel="instances" thread-count="1">
- <suite-files>
- <suite-file path="./tiered-jcloud-storage.xml" />
- </suite-files>
-</suite>
diff --git a/tests/pulsar-client-admin-shade-test/src/test/resources/pulsar.xml b/tests/pulsar-client-admin-shade-test/src/test/resources/pulsar.xml
index e32e9b464a1..d95dd95ae17 100644
--- a/tests/pulsar-client-admin-shade-test/src/test/resources/pulsar.xml
+++ b/tests/pulsar-client-admin-shade-test/src/test/resources/pulsar.xml
@@ -19,8 +19,6 @@
-->
<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Shade Tests" verbose="2" annotations="JDK">
<test name="pulsar-client-admin-shade-suite" preserve-order="true" >
<classes>
diff --git a/tests/pulsar-client-all-shade-test/src/test/resources/pulsar.xml b/tests/pulsar-client-all-shade-test/src/test/resources/pulsar.xml
index 746cc3d1b9e..5c725f80eae 100644
--- a/tests/pulsar-client-all-shade-test/src/test/resources/pulsar.xml
+++ b/tests/pulsar-client-all-shade-test/src/test/resources/pulsar.xml
@@ -19,8 +19,6 @@
-->
<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Shade Tests" verbose="2" annotations="JDK">
<test name="pulsar-client-all-shade-suite" preserve-order="true" >
<classes>
diff --git a/tests/pulsar-client-shade-test/src/test/resources/pulsar.xml b/tests/pulsar-client-shade-test/src/test/resources/pulsar.xml
index df07642a018..6132ad05f6c 100644
--- a/tests/pulsar-client-shade-test/src/test/resources/pulsar.xml
+++ b/tests/pulsar-client-shade-test/src/test/resources/pulsar.xml
@@ -19,8 +19,6 @@
-->
<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
-<!-- TODO: we have to put suite files in one file to avoid executing TESTNG test suites multiple times.
- see {@link https://github.com/cbeust/testng/issues/508} -->
<suite name="Pulsar Shade Tests" verbose="2" annotations="JDK">
<test name="pulsar-client-shade-suite" preserve-order="true" >
<classes>