Somehow when too many runners they run over the top of each other -> …

…${IMPORTCOL} Test failed because there was 2 Street Data columns, we only imported one This should stop them failing
damies13 · Mar 24, 2024 · cdfb065 · cdfb065
1 parent 924b7dc
commit cdfb065
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 37 deletions.
diff --git a/.github/workflows/Regression_Tests.yaml b/.github/workflows/Regression_Tests.yaml
@@ -14,7 +14,7 @@ on:
 jobs:
   Agent:
     strategy:
-      # max-parallel: 6
+      max-parallel: 9
       matrix:
         # python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.x']
         # python: ['3.7']
@@ -75,6 +75,8 @@ jobs:
         run: robot --outputdir Regression_Tests/Logs/${{ matrix.platform }}_${{ matrix.python }} -e Performance Regression_Tests
         env:
           DISPLAY: :13.0
+          MATRIX_PLATFORM: ${{ matrix.platform }}
+          MATRIX_PYTHON: ${{ matrix.python }}
 
       - name: Archive Agent Logs
         if: ${{ success() }}

diff --git a/Regression_Tests/TestDataTable-GUI_Browser_chromium.robot b/Regression_Tests/TestDataTable-GUI_Browser_chromium.robot
@@ -14,6 +14,7 @@ Default Tags	GUI
 # chromium | firefox | webkit
 ${BROWSER}		chromium
 ${TABLENAME}		Regression_GUI_Browser_Chromium
+${IMPORTCOL} 		Street Data %{MATRIX_PYTHON} %{MATRIX_PLATFORM}
 
 
 *** Test Cases ***    Expression    Expected
@@ -229,10 +230,9 @@ Import Data From File
 	Should Be Equal As Strings	${hdrrow0_delim}	${hdrrow0},${hdrrow1},${hdrrow2}
 	Take Screenshot
 	${datacell0}= 	Get Text	id=preview-tablecell-1-0
-	${newhdr}=		Set Variable    Street Data
-	Fill Text		id=preview-c0	${newhdr}
+	Fill Text		id=preview-c0	${IMPORTCOL}
 	${chknewhdr}= 	Get Text 	id=preview-c0
-	Should Be Equal As Strings	${newhdr}	${newhdr}
+	Should Be Equal As Strings	${chknewhdr} 	${IMPORTCOL}
 	Take Screenshot
 
 	${old_timeout} =    Set Browser Timeout    5 minutes
@@ -252,12 +252,12 @@ Import Data From File
 	Take Screenshot
 	# Wait Until Element Is Not Visible	id=dialog-progress-bar
 	Wait Until Element Is Not Visible	id=dialog-progress-subject
-	Wait Until Element Is Visible	//*[@name="Street Data"]
+	Wait Until Element Is Visible	//*[@name="${IMPORTCOL}"]
 	Take Screenshot
 
 	Set Browser Timeout    ${old_timeout}
 
-	${colid}=	Get Attribute	//*[@name="Street Data"]	id
+	${colid}=	Get Attribute	//*[@name="${IMPORTCOL}"]	id
 	${chk1strow}= 	Get Text	id=${colid}-0
 	# This check is not reliable as file importer sends the file in sections and
 	# 	they can get written out of order
@@ -266,28 +266,28 @@ Import Data From File
 
 Export Data To File
 	[Tags]	Table	Column	Values	Export
-	Wait Until Element Is Visible	//*[@name="Street Data"]
-	${colid}=	Get Attribute	//*[@name="Street Data"]	id
+	Wait Until Element Is Visible	//*[@name="${IMPORTCOL}"]
+	${colid}=	Get Attribute	//*[@name="${IMPORTCOL}"]	id
 	${chk1strow}= 	Get Text	id=${colid}-0
 	Click	id=export-file
 	Wait Until Element Is Enabled	//span[contains(@class, 'ui-dialog-title') and contains(text(), 'Text File Export')]
 	Take Screenshot
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Take Screenshot
 	${filename}= 	Get Text 	id=dialog-file-export-filename
 	Should Contain 	${filename} 	.csv
-	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		"${chk1strow}"
 	Click    id=dialog-file-export-header-row
 	${txtarea}= 	Get Text 	//div[@id='dialog-file-export-preview']/textarea
-	Should Not Contain		${txtarea}		Street Data
+	Should Not Contain		${txtarea}		${IMPORTCOL}
 	Take Screenshot
 	Click    id=dialog-file-export-header-row
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Click    	id=dialog-file-export-insert-tab
 	${delim}= 	Get Text 	id=dialog-file-export-delimiter
 	Should Be Equal As Strings		${delim}	\t
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${chk1strow}
 	${txtarea}= 	Get Text 	//div[@id='dialog-file-export-preview']/textarea
 	Should Not Contain		${txtarea}		"${chk1strow}"

diff --git a/Regression_Tests/TestDataTable-GUI_Browser_firefox.robot b/Regression_Tests/TestDataTable-GUI_Browser_firefox.robot
@@ -14,6 +14,7 @@ Default Tags 	GUI
 # chromium | firefox | webkit
 ${BROWSER}		firefox
 ${TABLENAME}		Regression_GUI_Browser_FireFox
+${IMPORTCOL} 		Street Data %{MATRIX_PYTHON} %{MATRIX_PLATFORM}
 
 
 *** Test Cases ***    Expression    Expected
@@ -230,10 +231,9 @@ Import Data From File
 	Should Be Equal As Strings	${hdrrow0_delim}	${hdrrow0},${hdrrow1},${hdrrow2}
 	Take Screenshot
 	${datacell0}= 	Get Text	id=preview-tablecell-1-0
-	${newhdr}=		Set Variable    Street Data
-	Fill Text		id=preview-c0	${newhdr}
+	Fill Text		id=preview-c0 	${IMPORTCOL}
 	${chknewhdr}= 	Get Text 	id=preview-c0
-	Should Be Equal As Strings	${newhdr}	${newhdr}
+	Should Be Equal As Strings	${chknewhdr} 	${IMPORTCOL}
 	Take Screenshot
 
 	${old_timeout} =    Set Browser Timeout    5 minutes
@@ -253,12 +253,12 @@ Import Data From File
 	Take Screenshot
 	# Wait Until Element Is Not Visible	id=dialog-progress-bar
 	Wait Until Element Is Not Visible	id=dialog-progress-subject
-	Wait Until Element Is Visible	//*[@name="Street Data"]
+	Wait Until Element Is Visible	//*[@name="${IMPORTCOL}"]
 	Take Screenshot
 
 	Set Browser Timeout    ${old_timeout}
 
-	${colid}=	Get Attribute	//*[@name="Street Data"]	id
+	${colid}=	Get Attribute	//*[@name="${IMPORTCOL}"]	id
 	${chk1strow}= 	Get Text	id=${colid}-0
 	# This check is not reliable as file importer sends the file in sections and
 	# 	they can get written out of order
@@ -267,28 +267,28 @@ Import Data From File
 
 Export Data To File
 	[Tags]	Table	Column	Values	Export
-	Wait Until Element Is Visible	//*[@name="Street Data"]
-	${colid}=	Get Attribute	//*[@name="Street Data"]	id
+	Wait Until Element Is Visible	//*[@name="${IMPORTCOL}"]
+	${colid}=	Get Attribute	//*[@name="${IMPORTCOL}"]	id
 	${chk1strow}= 	Get Text	id=${colid}-0
 	Click	id=export-file
 	Wait Until Element Is Enabled	//span[contains(@class, 'ui-dialog-title') and contains(text(), 'Text File Export')]
 	Take Screenshot
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Take Screenshot
 	${filename}= 	Get Text 	id=dialog-file-export-filename
 	Should Contain 	${filename} 	.csv
-	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		"${chk1strow}"
 	Click    id=dialog-file-export-header-row
 	${txtarea}= 	Get Text 	//div[@id='dialog-file-export-preview']/textarea
-	Should Not Contain		${txtarea}		Street Data
+	Should Not Contain		${txtarea}		${IMPORTCOL}
 	Take Screenshot
 	Click    id=dialog-file-export-header-row
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Click    	id=dialog-file-export-insert-tab
 	${delim}= 	Get Text 	id=dialog-file-export-delimiter
 	Should Be Equal As Strings		${delim}	\t
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${chk1strow}
 	${txtarea}= 	Get Text 	//div[@id='dialog-file-export-preview']/textarea
 	Should Not Contain		${txtarea}		"${chk1strow}"

diff --git a/Regression_Tests/TestDataTable-GUI_Browser_webkit.robot b/Regression_Tests/TestDataTable-GUI_Browser_webkit.robot
@@ -14,6 +14,7 @@ Default Tags	GUI
 # chromium | firefox | webkit
 ${BROWSER}		webkit
 ${TABLENAME}		Regression_GUI_Browser_Webkit
+${IMPORTCOL} 		Street Data %{MATRIX_PYTHON} %{MATRIX_PLATFORM}
 
 
 *** Test Cases ***    Expression    Expected
@@ -229,10 +230,9 @@ Import Data From File
 	Should Be Equal As Strings	${hdrrow0_delim}	${hdrrow0},${hdrrow1},${hdrrow2}
 	Take Screenshot
 	${datacell0}= 	Get Text	id=preview-tablecell-1-0
-	${newhdr}=		Set Variable    Street Data
-	Fill Text		id=preview-c0	${newhdr}
+	Fill Text		id=preview-c0	${IMPORTCOL}
 	${chknewhdr}= 	Get Text 	id=preview-c0
-	Should Be Equal As Strings	${newhdr}	${newhdr}
+	Should Be Equal As Strings	${chknewhdr} 	${IMPORTCOL}
 	Take Screenshot
 
 	${old_timeout} =    Set Browser Timeout    5 minutes
@@ -252,12 +252,12 @@ Import Data From File
 	Take Screenshot
 	# Wait Until Element Is Not Visible	id=dialog-progress-bar
 	Wait Until Element Is Not Visible	id=dialog-progress-subject
-	Wait Until Element Is Visible	//*[@name="Street Data"]
+	Wait Until Element Is Visible	//*[@name="${IMPORTCOL}"]
 	Take Screenshot
 
 	Set Browser Timeout    ${old_timeout}
 
-	${colid}=	Get Attribute	//*[@name="Street Data"]	id
+	${colid}=	Get Attribute	//*[@name="${IMPORTCOL}"]	id
 	${chk1strow}= 	Get Text	id=${colid}-0
 	# This check is not reliable as file importer sends the file in sections and
 	# 	they can get written out of order
@@ -266,28 +266,28 @@ Import Data From File
 
 Export Data To File
 	[Tags]	Table	Column	Values	Export
-	Wait Until Element Is Visible	//*[@name="Street Data"]
-	${colid}=	Get Attribute	//*[@name="Street Data"]	id
+	Wait Until Element Is Visible	//*[@name="${IMPORTCOL}"]
+	${colid}=	Get Attribute	//*[@name="${IMPORTCOL}"]	id
 	${chk1strow}= 	Get Text	id=${colid}-0
 	Click	id=export-file
 	Wait Until Element Is Enabled	//span[contains(@class, 'ui-dialog-title') and contains(text(), 'Text File Export')]
 	Take Screenshot
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Take Screenshot
 	${filename}= 	Get Text 	id=dialog-file-export-filename
 	Should Contain 	${filename} 	.csv
-	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		"${chk1strow}"
 	Click    id=dialog-file-export-header-row
 	${txtarea}= 	Get Text 	//div[@id='dialog-file-export-preview']/textarea
-	Should Not Contain		${txtarea}		Street Data
+	Should Not Contain		${txtarea}		${IMPORTCOL}
 	Take Screenshot
 	Click    id=dialog-file-export-header-row
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Click    	id=dialog-file-export-insert-tab
 	${delim}= 	Get Text 	id=dialog-file-export-delimiter
 	Should Be Equal As Strings		${delim}	\t
-	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		Street Data
+	Wait Until Keyword Succeeds    60s    200ms    Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${IMPORTCOL}
 	Textarea Should Contain 	//div[@id='dialog-file-export-preview']/textarea		${chk1strow}
 	${txtarea}= 	Get Text 	//div[@id='dialog-file-export-preview']/textarea
 	Should Not Contain		${txtarea}		"${chk1strow}"