Still strying to adjust test issue damies13#70 for macos

NiceProjectPoland · Apr 17, 2024 · 71f5be4 · 71f5be4
1 parent 1c9912c
commit 71f5be4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/Tests/Regression/Agent/CommandLine_Common.robot b/Tests/Regression/Agent/CommandLine_Common.robot
@@ -49,6 +49,7 @@ Run Manager CLI
 	# ${process}= 	Start Process 	python3 	${pyfile_manager}  @{options}  alias=Manager 	stdout=${OUTPUT DIR}${/}stdout_manager.txt 	stderr=${OUTPUT DIR}${/}stderr_manager.txt
 	${process}= 	Start Process 	${cmd_manager}  @{options}  alias=Manager 	stdout=${OUTPUT DIR}${/}stdout_manager.txt 	stderr=${OUTPUT DIR}${/}stderr_manager.txt
 	Set Test Variable 	$process_manager 	${process}
+	Sleep	5
 
 Wait For Manager
 	[Arguments]		${timeout}=10min

diff --git a/Tests/Regression/Manager/GUI_Common.robot b/Tests/Regression/Manager/GUI_Common.robot
@@ -104,31 +104,25 @@ Stop Agent
 
 Stop Test Scenario Run Gradually
 	[Arguments]	${rumup_time}	${robot_test_time}
-	[Setup]	Set Confidence	0.99
-	Sleep	${rumup_time}
-	Wait For	manager_${platform}_robots_10.png 	timeout=${rumup_time + 120}
+	Wait For	manager_${platform}_robots_10.png 	timeout=${rumup_time + 90}
 	Click Button	stoprun
 	${START_TIME}=	Get Current Date
-	Wait For	manager_${platform}_robots_0.png 	timeout=${robot_test_time + 120}
+	Wait For	manager_${platform}_robots_0.png 	timeout=${robot_test_time + 90}
 	Take A Screenshot
 	${END_TIME}=	Get Current Date
 	${ELAPSED_TIME}=	Subtract Date From Date	${END_TIME}	${START_TIME}
-	Should Be True	${ELAPSED_TIME} >= ${robot_test_time / 2} and ${ELAPSED_TIME} <= ${robot_test_time + 120}
+	Should Be True	${ELAPSED_TIME} >= ${robot_test_time / 2} and ${ELAPSED_TIME} <= ${robot_test_time + 90}
 
 	Press Key.tab 2 Times
 	Move To	10	10
 	Take A Screenshot
 	${status}=	Run Keyword And Return Status	
-	...    Wait For	manager_${platform}_button_finished_run.png 	timeout=${robot_test_time + 120}
+	...    Wait For	manager_${platform}_button_finished_run.png 	timeout=${robot_test_time + 90}
 	Run Keyword If	not ${status}	Fail	msg=Test didn't finish as fast as expected. Check screenshots for more informations.
 
-	[Teardown]	Set Confidence	0.9
-
 Stop Test Scenario Run Quickly
 	[Arguments]	${rumup_time}	${robot_test_time}
-	[Setup]	Set Confidence	0.99
-	Sleep	${rumup_time}
-	Wait For	manager_${platform}_robots_10.png 	timeout=${rumup_time + 120}
+	Wait For	manager_${platform}_robots_10.png 	timeout=${rumup_time + 90}
 	Click Button	stoprun
 	Sleep	2
 	Click
@@ -144,11 +138,9 @@ Stop Test Scenario Run Quickly
 	Move To	10	10
 	Take A Screenshot
 	${status}=	Run Keyword And Return Status
-	...    Wait For	manager_${platform}_button_finished_run.png 	timeout=${robot_test_time + 120}
+	...    Wait For	manager_${platform}_button_finished_run.png 	timeout=${robot_test_time + 90}
 	Run Keyword If	not ${status}	Fail	msg=Test didn't finish as fast as expected. Check screenshots for more informations.
 
-	[Teardown]	Set Confidence	0.9
-
 Check If The Agent Has Connected To The Manager
 	Sleep	1
 	Click Tab	Agents
@@ -398,7 +390,7 @@ Select Robot File
 	Log		${robot_file_name}
 	Take A Screenshot
 	Click Dialog Button		${robot_file_name}_robot
-	Sleep	1
+	Sleep	2
 	Take A Screenshot
 	Click Dialog Button		open
 	Sleep	1

diff --git a/Tests/Regression/Manager/GUI_Features.robot b/Tests/Regression/Manager/GUI_Features.robot
@@ -304,10 +304,10 @@ Check If Test Scenario Run Will Stop Gradually
 	[Setup]	Run Keywords
 	...    Set INI Window Size		1200	600							AND
 	...    CommandLine_Common.Run Agent									AND
-	...    Open Manager GUI												AND
+	...    CommandLine_Common.Run Manager CLI							AND
 	...    Set Global Filename And Default Save Path	example.robot	AND
 	...    Set Confidence	0.96										AND
-	...    Create Robot File	file_content=***Test Case***\nExample Test Case\n\tSleep\t60
+	...    Create Robot File	file_content=***Test Case***\nExample Test Case\n\tTest\n***Keywords***\nTest\n\t[Documentation]\t60s\n\tSleep\t60\n
 
 	Press Key.tab 4 Times
 	Type	15
@@ -332,11 +332,11 @@ Check If Test Scenario Run Will Stop Fast (Agent sends terminate singal to the r
 	[Setup]	Run Keywords
 	...    Set INI Window Size		1200	600							AND
 	...    CommandLine_Common.Run Agent									AND
-	...    Open Manager GUI												AND
+	...    CommandLine_Common.Run Manager CLI							AND
 	...    Set Global Filename And Default Save Path	example.robot	AND
 	...    Set Confidence	0.96										AND
 	...    Create Robot File	
-	...    file_content=***Test Case***\nExample Test Case\n\tSleep\t15\n\tSleep\t15\n\tSleep\t15\n\tSleep\t15
+	...    file_content=***Test Case***\nExample Test Case\n\tTest\n***Keywords***\nTest\n\t[Documentation]\t60s\n\tSleep\t15\n\tSleep\t15\n\tSleep\t15\n\tSleep\t15\n
 
 	Press Key.tab 4 Times
 	Type	15