Unverified Commit 4aed82c3 authored by dailidong's avatar dailidong Committed by GitHub
Browse files

Merge branch 'dev' into dev

parents c56e555a 4aa18267
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import org.apache.dolphinscheduler.server.zk.SpringZKServer;
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
import org.apache.dolphinscheduler.service.process.ProcessService;
import org.apache.dolphinscheduler.service.queue.TaskPriorityQueue;
import org.apache.dolphinscheduler.service.queue.TaskPriorityQueueImpl;
import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;
import org.apache.dolphinscheduler.service.zk.ZookeeperConfig;
import org.junit.Before;
@@ -232,9 +231,7 @@ public class TaskPriorityQueueConsumerTest {
        dataSource.setConnectionParams("{\"address\":\"jdbc:mysql://192.168.221.185:3306\",\"database\":\"dolphinscheduler_qiaozhanwei\",\"jdbcUrl\":\"jdbc:mysql://192.168.221.185:3306/dolphinscheduler_qiaozhanwei\",\"user\":\"root\",\"password\":\"root@123\"}");
        dataSource.setCreateTime(new Date());
        dataSource.setUpdateTime(new Date());

        Mockito.when(processService.findDataSourceById(1)).thenReturn(dataSource);

        Mockito.doReturn(dataSource).when(processService).findDataSourceById(1);
        Thread.sleep(10000);
    }