Skip to content

Commit 512e23c

Browse files
committed
Use coverage directly instead of pytest-cov
1 parent e7041f7 commit 512e23c

File tree

7 files changed

+22
-13
lines changed

7 files changed

+22
-13
lines changed

.github/pseudo-cluster/reframe/docker-entrypoint.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ sudo service munge start
88
cp -r /usr/local/share/reframe .
99
cd reframe
1010
./bootstrap.sh
11-
pip install pytest-cov
11+
pip install coverage
12+
source $HOME/.profile
1213

1314
echo "Running unittests with backend scheduler: ${BACKEND}"
1415

1516
tempdir=$(mktemp -d -p /scratch)
16-
TMPDIR=$tempdir ./test_reframe.py --cov=reframe --cov-report=xml \
17+
TMPDIR=$tempdir coverage run --source=reframe ./test_reframe.py \
1718
--rfm-user-config=ci-scripts/configs/ci-cluster.py \
1819
--rfm-user-system=pseudo-cluster:compute-${BACKEND:-squeue}
20+
coverage xml -o coverage.xml

.github/workflows/main.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ jobs:
1919
./bootstrap.sh
2020
- name: Generic Unittests
2121
run: |
22-
pip install pytest-cov
23-
./test_reframe.py --cov=reframe --cov-report=xml
22+
pip install coverage
23+
coverage run --source=reframe ./test_reframe.py
24+
coverage xml -o coverage.xml
2425
- name: Upload coverage reports
2526
uses: codecov/codecov-action@v4.2.0
2627

@@ -40,8 +41,9 @@ jobs:
4041
./bootstrap.sh
4142
- name: Generic Unittests
4243
run: |
43-
pip install pytest-cov
44-
./test_reframe.py --cov=reframe --cov-report=xml
44+
pip install coverage
45+
coverage run --source=reframe ./test_reframe.py
46+
coverage xml -o coverage.xml
4547
- name: Upload coverage reports
4648
uses: codecov/codecov-action@v4.2.0
4749

.github/workflows/test-flux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
# Any additional examples added here will be tested
3737
- name: Start Flux and Run Test
3838
run: |
39-
export PATH=$PWD/bin:$PATH
4039
which reframe
4140
flux start reframe -c examples/howto/flux -C examples/howto/flux/settings.py -l
4241
flux start reframe -c examples/howto/flux -C examples/howto/flux/settings.py -r
43-
flux start python3 ./test_reframe.py --cov=reframe --cov-report=xml --rfm-user-config=examples/howto/flux/settings.py
42+
flux start coverage run --source=reframe ./test_reframe.py --rfm-user-config=examples/howto/flux/settings.py
43+
coverage xml -o coverage.xml
4444
- name: Upload coverage reports
4545
uses: codecov/codecov-action@v4.2.0

ci-scripts/dockerfiles/reframe-envmodules.dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ COPY --chown=rfmuser . /home/rfmuser/reframe/
2121
WORKDIR /home/rfmuser/reframe
2222

2323
RUN ./bootstrap.sh
24+
RUN pip install --break-system-packages coverage
25+
ENV BASH_ENV=/home/rfmuser/.profile
2426

25-
CMD ["/bin/bash", "-c", "./test_reframe.py --cov=reframe --cov-report=xml --rfm-user-config=ci-scripts/configs/envmod.py"]
27+
CMD ["/bin/bash", "-c", "coverage run --source=reframe ./test_reframe.py --rfm-user-config=ci-scripts/configs/envmod.py; coverage xml -o coverage.xml"]

ci-scripts/dockerfiles/reframe-lmod.dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@ COPY --chown=rfmuser . /home/rfmuser/reframe/
2020
WORKDIR /home/rfmuser/reframe
2121

2222
RUN ./bootstrap.sh
23+
RUN pip install --break-system-packages coverage
24+
ENV BASH_ENV=/home/rfmuser/.profile
2325

24-
CMD ["/bin/bash", "-c", "./test_reframe.py --cov=reframe --cov-report=xml --rfm-user-config=ci-scripts/configs/lmod.py"]
26+
CMD ["/bin/bash", "-c", "coverage run --source=reframe ./test_reframe.py --rfm-user-config=ci-scripts/configs/lmod.py; coverage xml -o coverage.xml"]

ci-scripts/dockerfiles/reframe-python.dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ COPY --chown=rfmuser . /home/rfmuser/reframe/
1717

1818
WORKDIR /home/rfmuser/reframe
1919

20-
RUN ./bootstrap.sh +docs
20+
RUN ./bootstrap.sh
21+
RUN pip install --break-system-packages coverage
22+
ENV BASH_ENV=/home/rfmuser/.profile
2123

22-
CMD ["/bin/bash", "-c", "./test_reframe.py --cov=reframe --cov-report=xml"]
24+
CMD ["/bin/bash", "-c", "coverage run --source=reframe ./test_reframe.py; coverage xml -o coverage.xml"]

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ jsonschema==3.2.0
88
lxml==6.0.2
99
pytest==8.4.2; python_version == '3.9'
1010
pytest==9.0.1; python_version >= '3.10'
11-
pytest-cov==7.0.0
1211
pytest-forked==1.6.0
1312
pytest-parallel==0.1.1
1413
pytest-rerunfailures==16.0.1; python_version == '3.9'

0 commit comments

Comments
 (0)