[incubator-eventmesh] branch master updated: [ISSUE #692]Change the default merge strategy to squash (#695)

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c0f8a9  [ISSUE #692]Change the default merge strategy to squash (#695)
5c0f8a9 is described below

commit 5c0f8a99c3c9db710acad590a7f19b6f12fcc9e5
Author: Wenjun Ruan <we...@apache.org>
AuthorDate: Thu Jan 6 10:14:55 2022 +0800

    [ISSUE #692]Change the default merge strategy to squash (#695)
    
    * Change the default merge strategy to squash
    close #692
---
 .asf.yaml                                          |  2 +-
 .../eventmesh/common/utils/ThreadUtilsTest.java    | 58 ----------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 4234e7a..0ca3390 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -37,8 +37,8 @@ github:
     - microservice
     - state-management
   enabled_merge_buttons:
-    merge:   true
     squash:  true
+    merge:   true
     rebase:  false
   protected_branches:
     master:
diff --git a/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ThreadUtilsTest.java b/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ThreadUtilsTest.java
deleted file mode 100644
index 8aebf88..0000000
--- a/eventmesh-common/src/test/java/org/apache/eventmesh/common/utils/ThreadUtilsTest.java
+++ /dev/null
@@ -1,58 +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.
- */
-
-package org.apache.eventmesh.common.utils;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ThreadUtilsTest {
-
-    @Test
-    public void testRandomSleep() throws InterruptedException {
-        TestThread testThread = new TestThread();
-        testThread.start();
-        testThread.join();
-        Assert.assertTrue(testThread.getSleepTime() > 0);
-        Assert.assertTrue(testThread.getSleepTime() <= 60);
-    }
-
-    @Test
-    public void testPID() {
-        Assert.assertNotEquals(-1, ThreadUtils.getPID());
-    }
-
-    class TestThread extends Thread {
-
-        private long sleepTime;
-
-        public long getSleepTime() {
-            return sleepTime;
-        }
-
-        public void run() {
-            long startTime = System.currentTimeMillis();
-            try {
-                ThreadUtils.randomSleep(50);
-            } catch (Exception ignore) {
-                //ignore
-            }
-
-            sleepTime = System.currentTimeMillis() - startTime;
-        }
-    }
-}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org