Skip to content

Commit 73c6606

Browse files
committed
revert to port 80 and add OS tags
Issue #18
1 parent 7177487 commit 73c6606

8 files changed

+27
-11
lines changed

.github/workflows/Regression_Tests.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,24 @@ jobs:
7878
- name: Run rfbrowser init for Browser Library
7979
run: rfbrowser init
8080

81+
- name: Update Robot Tag
82+
shell: python
83+
run: |
84+
import os
85+
tag = "${{ matrix.platform }}"
86+
tagarr = tag.split("-")
87+
tag = "{}-latest".format(tagarr[0])
88+
platform = "{}".format(tagarr[0])
89+
90+
env_file = os.getenv('GITHUB_ENV')
91+
with open(env_file, "a") as myfile:
92+
myfile.write("tag={}\n".format(tag))
93+
myfile.write("platform={}\n".format(platform))
94+
95+
8196
- name: Robot Framework
8297
# run: robot --outputdir Regression_Tests/Logs/${{ matrix.platform }}_${{ matrix.python }} -v STT_MIN:1 -v STT_MAX:5 Regression_Tests
83-
run: robot --outputdir Regression_Tests/Logs/${{ matrix.platform }}_${{ matrix.python }} -e Performance Regression_Tests
98+
run: robot --include ${{ env.platform }} --outputdir Regression_Tests/Logs/${{ matrix.platform }}_${{ matrix.python }} -e Performance Regression_Tests
8499
env:
85100
DISPLAY: :13.0
86101
MATRIX_PLATFORM: ${{ matrix.platform }}

Regression_Tests/CommandLine_Bugs.robot

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ Resource CommandLine_Common.robot
44

55
*** Test Cases ***
66
Check for Hang if port can't be opened
7-
[Tags] CommandLine Issue #18
7+
[Tags] CommandLine Issue #18 ubuntu windows
8+
# port 80 doesn't fail on MacOS, only windows and linux, so set to port 1080 as there is already
9+
# a TDT instance running there (suite Setup) so should always fail here
810

911
# [Server]
1012
# bindip =
1113
# bindport = 80
1214
# datadir = ${OUTPUT DIR}${/}${TEST NAME}
1315
# dbfile = TestDataTable.sqlite3
14-
# &{server} = Create Dictionary bindport=80 datadir=${OUTPUT DIR}${/}${TEST NAME}
15-
# port 80 doesn't fail on MacOS, only windows and linux, so set to port 1080 as there is already
16-
# a TDT instance running there (suite Setup) so should always fail here
17-
&{server} = Create Dictionary bindport=1080 datadir=${OUTPUT DIR}${/}${TEST NAME}
16+
&{server} = Create Dictionary bindport=80 datadir=${OUTPUT DIR}${/}${TEST NAME}
1817

1918
# [Resources]
2019
# js_jquery = https://unpkg.com/jquery@latest/dist/jquery.min.js

Regression_Tests/TestDataTable-API_REST.robot

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Resource environment.robot
33

44
Library REST ${TDT_Host}
55

6+
Test Tags API REST Library ubuntu macos windows
7+
68
*** Test cases ***
79
Create Table regression 1
810
[Tags] Create Table

Regression_Tests/TestDataTable-API_requests.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Library String
1010

1111
Suite Setup Connect to TDT
1212

13-
Default Tags API RequestsLibrary
13+
Test Tags API RequestsLibrary ubuntu macos windows
1414

1515
*** Test cases ***
1616
Create Blank Table

Regression_Tests/TestDataTable-GUI_Browser_chromium.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Library Browser
77
Suite Setup Open TDT GUI
88
Suite Teardown TDT GUI End Test
99

10-
Default Tags GUI
10+
Test Tags GUI ubuntu macos windows
1111

1212
*** Variables ***
1313
# ${BROWSER} ff

Regression_Tests/TestDataTable-GUI_Browser_firefox.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Library Browser
77
Suite Setup Open TDT GUI
88
Suite Teardown TDT GUI End Test
99

10-
Default Tags GUI
10+
Test Tags GUI ubuntu macos windows
1111

1212
*** Variables ***
1313
# ${BROWSER} ff

Regression_Tests/TestDataTable-GUI_Browser_webkit.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Library Browser
77
Suite Setup Open TDT GUI
88
Suite Teardown TDT GUI End Test
99

10-
Default Tags GUI
10+
Test Tags GUI ubuntu macos windows
1111

1212
*** Variables ***
1313
# ${BROWSER} ff

Regression_Tests/TestDataTable-GUI_SeleniumLibrary.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Suite Teardown TDT GUI End Test
88

99
Test Setup Go To http://${TDT_Host}/
1010

11-
Default Tags GUI
11+
Test Tags GUI ubuntu macos windows
1212

1313
*** Variables ***
1414
# ${BROWSER} ff

0 commit comments

Comments
 (0)