Add ASF header for plain_acl.yml

acl/src/test/resources/conf/plain_acl.yml

@@ -1,3 +1,20 @@
+# 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.
+
+## suggested format
+
 globalWhiteRemoteAddresses:
 - 10.10.103.*
 - 192.168.0.*

test/src/test/java/org/apache/rocketmq/test/client/consumer/pop/PopSubCheckIT.java

@@ -27,6 +27,7 @@ import org.apache.rocketmq.test.client.rmq.RMQPopConsumer;
 import org.apache.rocketmq.test.factory.ConsumerFactory;
 import org.apache.rocketmq.test.listener.rmq.concurrent.RMQNormalListener;
 import org.apache.rocketmq.test.util.RandomUtil;
+import org.apache.rocketmq.test.util.TestUtils;
 import org.apache.rocketmq.test.util.VerifyUtils;
 import org.apache.rocketmq.tools.admin.DefaultMQAdminExt;
 import org.junit.After;
@@ -78,6 +79,8 @@ public class PopSubCheckIT extends BaseConf {
         Assert.assertEquals("Not all sent succeeded", msgNum, producer.getAllUndupMsgBody().size());
         logger.info(producer.getFirstMsg());
 
+        TestUtils.waitForSeconds(10);
+
         consumer.getListener().waitForMessageConsume(msgNum, 30_000);
         assertThat(VerifyUtils.getFilterdMessage(producer.getAllMsgBody(), consumer.getListener().getAllMsgBody()))
             .containsExactlyElementsIn(producer.getAllMsgBody());