Skip to content

Commit bc0d5c0

Browse files
authored
Use different RF version in CI (#23)
Use and support Robot Framework 3.1 and 3.2
1 parent 2187dd6 commit bc0d5c0

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ jobs:
99
strategy:
1010
matrix:
1111
python-version: [2.7, 3.6, 3.7, 3.8]
12+
rf-version: [3.1.2, 3.2b2]
1213

1314
steps:
1415
- uses: actions/checkout@v2
15-
- name: Set up Python ${{ matrix.python-version }}
16+
- name: Set up Python ${{ matrix.python-version }} with Robot Framework ${{ matrix.rf-version }}
1617
uses: actions/setup-python@v1
1718
with:
1819
python-version: ${{ matrix.python-version }}
1920
- name: Install dependencies
2021
run: |
2122
python -m pip install --upgrade pip
2223
pip install -r requirements-dev.txt
24+
pip install robotframework==${{ matrix.rf-version }}
2325
- name: Run unit tests
2426
run: |
2527
python utest/run.py

atest/run.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import sys
88

99
from robot import run, rebot
10+
from robot.version import VERSION as rf_version
1011
from robotstatuschecker import process_output
1112

1213

@@ -17,16 +18,16 @@
1718
sys.path.insert(0, join(curdir, '..', 'src'))
1819
python_version = platform.python_version()
1920
for variant in library_variants:
20-
output = join(outdir, '%s-%s.xml' % (variant, python_version))
21+
output = join(outdir, 'lib-%s-python-%s-robot-%s.xml' % (variant, python_version, rf_version))
2122
rc = run(tests, name=variant, variable='LIBRARY:%sLibrary' % variant,
2223
output=output, report=None, log=None)
2324
if rc > 250:
2425
sys.exit(rc)
2526
process_output(output, verbose=False)
2627
print('\nCombining results.')
27-
rc = rebot(*(join(outdir, '%s-%s.xml' % (variant, python_version)) for variant in library_variants),
28-
**dict(name='Acceptance Tests', outputdir=outdir, log='log-%s.html' % python_version,
29-
report='report-%s.html' % python_version))
28+
rc = rebot(*(join(outdir, 'lib-%s-python-%s-robot-%s.xml' % (variant, python_version, rf_version)) for variant in library_variants),
29+
**dict(name='Acceptance Tests', outputdir=outdir, log='log-python-%s-robot-%s.html' % (python_version, rf_version),
30+
report='report-python-%s-robot-%s.html' % (python_version, rf_version)))
3031
if rc == 0:
3132
print('\nAll tests passed/failed as expected.')
3233
else:

atest/tests.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Keyword names
1616
... Keyword in extending library
1717

1818
Method without @keyword are not keyowrds
19-
[Documentation] FAIL No keyword with name 'Not keyword' found.
19+
[Documentation] FAIL GLOB: No keyword with name 'Not keyword' found.*
2020
Not keyword
2121

2222
Arguments

utest/run.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import sys
55

66
import pytest
7-
7+
from robot.version import VERSION as rf_version
88

99
curdir = dirname(abspath(__file__))
1010
atest_dir = join(curdir, '..', 'atest')
1111
python_version = platform.python_version()
12-
xunit_report = join(atest_dir, 'results', 'xunit-%s.xml' % python_version)
12+
xunit_report = join(atest_dir, 'results', 'xunit-python-%s-robot%s.xml' % (python_version, rf_version))
1313
src = join(curdir, '..', 'src')
1414
sys.path.insert(0, src)
1515
sys.path.insert(0, atest_dir)

0 commit comments

Comments
 (0)