This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 6b6ea76201 Fix CI is not failed when test have errors (#3790)
6b6ea76201 is described below
commit 6b6ea7620157b600ded505b38dec472da824fe17
Author: Yong Zhang <[email protected]>
AuthorDate: Wed Feb 22 01:52:54 2023 +0800
Fix CI is not failed when test have errors (#3790)
* Fix CI is not failed when test have errors
---
### Motivation
We added the test coverage to report the tests status.
But when we use the code-coverage profile, it will ignore
test failure because we set `<testFailureIgnore>true</testFailureIgnore>`.
We should do the test and test coverage in different steps
and fail the test if there have errors.
* Fix the test errors
---
.github/workflows/bk-ci.yml | 2 +-
.../test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java | 2 ++
.../java/org/apache/bookkeeper/bookie/BookieJournalMaxMemoryTest.java | 2 ++
.../org/apache/bookkeeper/bookie/BookieJournalPageCacheFlushTest.java | 2 ++
.../src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java | 3 ++-
.../src/test/java/org/apache/bookkeeper/bookie/BookieShellTest.java | 2 ++
.../java/org/apache/bookkeeper/bookie/BookieWriteToJournalTest.java | 3 ++-
.../apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java | 2 ++
.../java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java | 2 +-
.../java/org/apache/bookkeeper/meta/zk/ZKMetadataBookieDriverTest.java | 2 ++
.../java/org/apache/bookkeeper/meta/zk/ZKMetadataClientDriverTest.java | 2 ++
.../java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java | 2 ++
.../src/test/java/org/apache/bookkeeper/server/TestEmbeddedServer.java | 2 ++
pom.xml | 3 +--
14 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/bk-ci.yml b/.github/workflows/bk-ci.yml
index 493c4dc200..c38a2680ac 100644
--- a/.github/workflows/bk-ci.yml
+++ b/.github/workflows/bk-ci.yml
@@ -434,4 +434,4 @@ jobs:
with:
name: dependency report
path: target/dependency-check-report.html
- retention-days: 7
\ No newline at end of file
+ retention-days: 7
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java
index 6d0aababef..2ed3a48efb 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalForceTest.java
@@ -55,6 +55,7 @@ import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
@@ -63,6 +64,7 @@ import org.powermock.reflect.Whitebox;
* Test the bookie journal.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*", "javax.xml.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({JournalChannel.class, Journal.class,
DefaultFileChannel.class})
@Slf4j
public class BookieJournalForceTest {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalMaxMemoryTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalMaxMemoryTest.java
index 804a7f3fb1..cd9aac2b8b 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalMaxMemoryTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalMaxMemoryTest.java
@@ -38,6 +38,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
@@ -46,6 +47,7 @@ import org.powermock.reflect.Whitebox;
* Test the bookie journal max memory controller.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({JournalChannel.class, Journal.class})
@Slf4j
public class BookieJournalMaxMemoryTest {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalPageCacheFlushTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalPageCacheFlushTest.java
index 8b98a622dd..02b151feed 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalPageCacheFlushTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalPageCacheFlushTest.java
@@ -51,6 +51,7 @@ import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
@@ -59,6 +60,7 @@ import org.powermock.reflect.Whitebox;
* Test the bookie journal PageCache flush interval.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({JournalChannel.class, Journal.class})
@Slf4j
public class BookieJournalPageCacheFlushTest {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
index 77db1959cd..d8f0a7a785 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
@@ -60,7 +60,8 @@ import org.slf4j.LoggerFactory;
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({JournalChannel.class, FileChannelProvider.class})
-@PowerMockIgnore({"jdk.internal.loader.*", "javax.naming.*"})
+@PowerMockIgnore({"jdk.internal.loader.*", "javax.xml.*", "org.xml.*",
"org.w3c.*",
+ "com.sun.org.apache.xerces.*", "javax.naming.*"})
public class BookieJournalTest {
private static final Logger LOG =
LoggerFactory.getLogger(BookieJournalTest.class);
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieShellTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieShellTest.java
index 8b793ada62..d2fdf0662b 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieShellTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieShellTest.java
@@ -67,6 +67,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -74,6 +75,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
* Unit test for {@link BookieShell}.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*",
"org.w3c.*"})
@PrepareForTest({ BookieShell.class, MetadataDrivers.class,
RecoverCommand.class })
public class BookieShellTest {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieWriteToJournalTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieWriteToJournalTest.java
index a4761e4a3e..05c231dbaa 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieWriteToJournalTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieWriteToJournalTest.java
@@ -60,7 +60,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
*/
@RunWith(PowerMockRunner.class)
@PrepareForTest({BookieImpl.class})
-@PowerMockIgnore({"jdk.internal.loader.*", "javax.naming.*"})
+@PowerMockIgnore({"jdk.internal.loader.*", "javax.naming.*", "javax.xml.*",
+ "com.sun.org.apache.xerces.*", "org.w3c.*", "org.xml.*"})
@Slf4j
public class BookieWriteToJournalTest {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java
index c48881a6c1..9740145d2e 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/discover/AbstractTestZkRegistrationClient.java
@@ -71,6 +71,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -78,6 +79,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
* Unit test of {@link RegistrationClient}.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({ ZKRegistrationClient.class, ZkUtils.class })
@Slf4j
public abstract class AbstractTestZkRegistrationClient extends
MockZooKeeperTestCase {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java
index 720ed3a594..1c2eda8a46 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerTest.java
@@ -86,7 +86,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
* Unit test of {@link AbstractZkLedgerManager}.
*/
@RunWith(PowerMockRunner.class)
-@PowerMockIgnore("javax.management.*")
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({ AbstractZkLedgerManager.class, ZkUtils.class })
public class AbstractZkLedgerManagerTest extends MockZooKeeperTestCase {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataBookieDriverTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataBookieDriverTest.java
index 055ab60e2c..c5069c077a 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataBookieDriverTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataBookieDriverTest.java
@@ -36,6 +36,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -43,6 +44,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
* Unit test {@link ZKMetadataBookieDriver}.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({ ZKMetadataDriverBase.class, ZooKeeperClient.class,
ZKMetadataBookieDriver.class })
public class ZKMetadataBookieDriverTest extends ZKMetadataDriverTestBase {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataClientDriverTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataClientDriverTest.java
index 75aadef795..6331f5dbb4 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataClientDriverTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataClientDriverTest.java
@@ -40,6 +40,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -47,6 +48,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
* Unit test {@link ZKMetadataClientDriver}.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({ ZKMetadataDriverBase.class, ZooKeeperClient.class,
ZKMetadataClientDriver.class })
public class ZKMetadataClientDriverTest extends ZKMetadataDriverTestBase {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java
index 2386a7fe06..ab9c0030f4 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/zk/ZKMetadataDriverBaseTest.java
@@ -46,6 +46,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -53,6 +54,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
* Unit test of {@link ZKMetadataDriverBase}.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({ ZKMetadataDriverBase.class, ZooKeeperClient.class,
AbstractZkLedgerManagerFactory.class })
public class ZKMetadataDriverBaseTest extends ZKMetadataDriverTestBase {
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/TestEmbeddedServer.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/TestEmbeddedServer.java
index 698d14e101..9d24b99af0 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/TestEmbeddedServer.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/server/TestEmbeddedServer.java
@@ -59,6 +59,7 @@ import org.apache.bookkeeper.util.DiskChecker;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -66,6 +67,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
* Unit test of {@link EmbeddedServer}.
*/
@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.xml.*", "org.xml.*", "org.w3c.*",
"com.sun.org.apache.xerces.*"})
@PrepareForTest({BookieService.class, BookieResources.class,
EmbeddedServer.class})
public class TestEmbeddedServer {
diff --git a/pom.xml b/pom.xml
index 7d65f6fdcf..5d3dc6b61f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1132,8 +1132,7 @@
<forkCount>${forkCount.variable}</forkCount>
<reuseForks>false</reuseForks>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
- <!-- we want build to complete even in case of failures -->
- <testFailureIgnore>true</testFailureIgnore>
+
<rerunFailingTestsCount>${testRetryCount}</rerunFailingTestsCount>
</configuration>
</plugin>
<plugin>
