This is an automated email from the ASF dual-hosted git repository.
lizhanhui pushed a commit to branch bazel
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/bazel by this push:
new 6938f1beb Fix flaky tests (#4875)
6938f1beb is described below
commit 6938f1beb8ddac8620e04be404c9f3a6b2e2cbb6
Author: Zhanhui Li <[email protected]>
AuthorDate: Wed Aug 24 00:36:59 2022 +0800
Fix flaky tests (#4875)
* Add back flaky tests to resolve
* Tag missing @Test annotation
---
.../apache/rocketmq/broker/processor/ReplyMessageProcessorTest.java | 2 --
client/BUILD.bazel | 4 ++++
.../rocketmq/client/consumer/DefaultLitePullConsumerTest.java | 6 ------
.../java/org/apache/rocketmq/common/message/MessageDecoderTest.java | 2 --
.../controller/impl/controller/impl/DLedgerControllerTest.java | 5 -----
5 files changed, 4 insertions(+), 15 deletions(-)
diff --git
a/broker/src/test/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessorTest.java
b/broker/src/test/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessorTest.java
index cf4a86f66..a60ba7715 100644
---
a/broker/src/test/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessorTest.java
+++
b/broker/src/test/java/org/apache/rocketmq/broker/processor/ReplyMessageProcessorTest.java
@@ -48,7 +48,6 @@ import org.apache.rocketmq.store.PutMessageResult;
import org.apache.rocketmq.store.PutMessageStatus;
import org.apache.rocketmq.store.config.MessageStoreConfig;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -92,7 +91,6 @@ public class ReplyMessageProcessorTest {
replyMessageProcessor = new ReplyMessageProcessor(brokerController);
}
- @Ignore
@Test
public void testProcessRequest_Success() throws RemotingCommandException,
InterruptedException, RemotingTimeoutException, RemotingSendRequestException {
when(messageStore.putMessage(any(MessageExtBrokerInner.class))).thenReturn(new
PutMessageResult(PutMessageStatus.PUT_OK, new
AppendMessageResult(AppendMessageStatus.PUT_OK)));
diff --git a/client/BUILD.bazel b/client/BUILD.bazel
index 564bb95e0..c30be20ea 100644
--- a/client/BUILD.bazel
+++ b/client/BUILD.bazel
@@ -59,4 +59,8 @@ GenTestRules(
deps = [
":tests",
],
+ medium_tests = [
+
"src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest",
+
"src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest",
+ ],
)
diff --git
a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
index 1fd759372..128e4cd8a 100644
---
a/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
+++
b/client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
@@ -54,7 +54,6 @@ import
org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
import org.apache.rocketmq.remoting.RPCHook;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -555,11 +554,6 @@ public class DefaultLitePullConsumerTest {
assertThat(offset).isEqualTo(100);
}
- /**
- * Disable this unit test case for now as it is too slow.
- * @throws Exception
- */
- @Ignore
@Test
public void testConsumerAfterShutdown() throws Exception {
DefaultLitePullConsumer defaultLitePullConsumer =
createSubscribeLitePullConsumer();
diff --git
a/common/src/test/java/org/apache/rocketmq/common/message/MessageDecoderTest.java
b/common/src/test/java/org/apache/rocketmq/common/message/MessageDecoderTest.java
index 779eaff8d..46469e7f8 100644
---
a/common/src/test/java/org/apache/rocketmq/common/message/MessageDecoderTest.java
+++
b/common/src/test/java/org/apache/rocketmq/common/message/MessageDecoderTest.java
@@ -19,7 +19,6 @@ package org.apache.rocketmq.common.message;
import org.apache.rocketmq.common.UtilAll;
import org.apache.rocketmq.common.sysflag.MessageSysFlag;
-import org.junit.Ignore;
import org.junit.Test;
import java.net.InetAddress;
@@ -258,7 +257,6 @@ public class MessageDecoderTest {
assertThat("abc").isEqualTo(decodedMsg.getTopic());
}
- @Ignore
@Test
public void testNullValueProperty() throws Exception {
MessageExt msg = new MessageExt();
diff --git
a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java
b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java
index c259ba28f..dce3167ef 100644
---
a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java
+++
b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/DLedgerControllerTest.java
@@ -41,7 +41,6 @@ import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
@@ -51,10 +50,6 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-/**
- * TODO: Let OS pick an available port
- */
-@Ignore
public class DLedgerControllerTest {
private List<String> baseDirs;
private List<DLedgerController> controllers;
