Unverified Commit e97b4707 authored Jul 14, 2020 by xingchun-chen Committed by GitHub Jul 14, 2020

[Test-2995][e2e] run workflow and timing testCase (#3201)



* add LoginTest license

* Delete useless packages

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* Update worker_group_id to worker_group in init.sql

* Update worker_group_id to worker_group in init.sql

* Update worker_group_id to worker_group

* Increase dataX environment variable, sslTrust default value

* modify dataX environment variable

* update e2e chrome version

* add alert manage testcase and Optimize test case execution order

* add e2e to create and to  edit  queue

* update e2e chrome version

* add e2e token testcase

* add e2e token testcase

* add e2e to run workflow testcase

* add e2e timing testcase

* add e2e timing testcase

* add e2e timing testcase

* add e2e timing testcase

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
#	e2e/src/test/java/org/apache/dolphinscheduler/page/security/QueueManagePage.java

* edit user

* edit user

* edit user

* edit user

* edit user

* Update TimingLocator.java

* modify ci log

* Update ci_e2e.yml

modify ci logs

* Update ci_e2e.yml

modify ci logs

* Update ci_e2e.yml

modify ci logs

* Update ci_e2e.yml

* Update ci_e2e.yml

modify ci logs

* Update ci_e2e.yml

modify ci logs

* Update ci_e2e.yml

modify ci logs

* Update ci_e2e.yml

modify ci logs

* Update ci_e2e.yml

modify artifact version

* Update ci_e2e.yml

* Update ci_e2e.yml

modify /var/lib/docker/volumes  permissions

* Update ci_e2e.yml

modify ci logs

* Update ci_e2e.yml

Modify log file permissions

* Update ci_e2e.yml

modify logs

* Update ci_e2e.yml

modify logs

* Update ci_e2e.yml

modify logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* Update ci_e2e.yml

modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* Update ci_e2e.yml

modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify ci logs

* modify tenant

* modify alert wait time

* modify queue wait time

* modify alert wait time

* modify alert wait time

* modify alert wait time

* modify alert wait time

* modify alert wait time

* modify alert wait time

* modify button xpath

* modify queue xpath

* Ignore edit user

* modify alert wait time

* print delete user log

* modify the xpath of delete user button

* modify timing wait time

Co-authored-by: chenxingchun <438044805@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>

parent 38e7494f

.github/workflows/ci_e2e.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,9 +66,9 @@ jobs:
		run: cd ./e2e && mvn -B clean test
		- name: Collect logs
		if: failure()
		uses: actions/upload-artifact@v1
		uses: actions/upload-artifact@v2
		with:
		name: dslogs
		path: /var/lib/docker/volumes/docker-swarm_dolphinscheduler-logs/_data
		path: ${{ github.workspace }}/docker/docker-swarm/dolphinscheduler-logs

docker/docker-swarm/docker-compose.yml

+5 −8

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ services:
		- dolphinscheduler-postgresql
		- dolphinscheduler-zookeeper
		volumes:
		- dolphinscheduler-logs:/opt/dolphinscheduler/logs
		- ./dolphinscheduler-logs:/opt/dolphinscheduler/logs
		networks:
		- dolphinscheduler

		@@ -95,7 +95,7 @@ services:
		depends_on:
		- dolphinscheduler-api
		volumes:
		- dolphinscheduler-logs:/var/log/nginx
		- ./dolphinscheduler-logs:/var/log/nginx
		networks:
		- dolphinscheduler

		@@ -133,7 +133,7 @@ services:
		depends_on:
		- dolphinscheduler-postgresql
		volumes:
		- dolphinscheduler-logs:/opt/dolphinscheduler/logs
		- ./dolphinscheduler-logs:/opt/dolphinscheduler/logs
		networks:
		- dolphinscheduler

		@@ -168,7 +168,7 @@ services:
		- dolphinscheduler-postgresql
		- dolphinscheduler-zookeeper
		volumes:
		- dolphinscheduler-logs:/opt/dolphinscheduler/logs
		- ./dolphinscheduler-logs:/opt/dolphinscheduler/logs
		networks:
		- dolphinscheduler

		@@ -210,9 +210,7 @@ services:
		- type: volume
		source: dolphinscheduler-worker-data
		target: /tmp/dolphinscheduler
		- type: volume
		source: dolphinscheduler-logs
		target: /opt/dolphinscheduler/logs
		- ./dolphinscheduler-logs:/opt/dolphinscheduler/logs
		networks:
		- dolphinscheduler

		@@ -225,7 +223,6 @@ volumes:
		dolphinscheduler-postgresql-initdb:
		dolphinscheduler-zookeeper:
		dolphinscheduler-worker-data:
		dolphinscheduler-logs:

		configs:
		dolphinscheduler-worker-task-env:

e2e/src/test/java/org/apache/dolphinscheduler/common/BrowserCommon.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,23 @@ public class BrowserCommon {
		return inputElement;
		}


		/**
		* input element after clearing
		*
		* @param locator By
		* @param content Input content
		* @return inputElement
		*/
		public WebElement clearSendInput(By locator, String content) {
		WebElement inputElement = locateElement(locator);
		//input date
		inputElement.clear();
		inputElement.sendKeys(Keys.HOME,Keys.chord(Keys.SHIFT,Keys.END));
		inputElement.sendKeys(content);
		return inputElement;
		}

		/**
		* clear element
		*

e2e/src/test/java/org/apache/dolphinscheduler/data/project/RunWorkflowData.java

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		/*
		* 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.dolphinscheduler.data.project;

		public class RunWorkflowData {
		/**
		* run workflow data
		*/
		//input shell task name
		public static final String RECIPIENT = "123456789@qq.com";

		//input shell task description
		public static final String Cc = "qwe12312sds@qq.com";

		public static final String RUN_WORKFLOW_TITLE = "工作流定义 - DolphinScheduler";


		}

e2e/src/test/java/org/apache/dolphinscheduler/data/project/TimingData.java

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/*
		* 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.dolphinscheduler.data.project;

		public class TimingData {
		/**
		* timing data
		*/
		//input shell task name
		public static final String RECIPIENT = "test123456@qq.com";

		//input shell task description
		public static final String Cc = "test.123qwe@qq.com";

		public static final String EDIT_RECIPIENT = "test.edit123456@qq.com";

		public static final String EDIT_Cc = "test.edit123qwe@qq.com";

		public static final String WORKFLOW_TITLE = "工作流定义 - DolphinScheduler";
		public static final String TIMING_TITLE = "定时任务列表 - DolphinScheduler";
		}