Skip to content

Commit ba6e5bc

Browse files
committed
Added correct arguments to combine
1 parent 1326710 commit ba6e5bc

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/integration.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ jobs:
103103
- name: Combine test coverage
104104
run: |
105105
ls -1
106-
coverage combine combined-coverage.xml coverage/
106+
coverage combine -a coverage/
107107
108108
- name: Upload test results and profiling data
109109
uses: actions/upload-artifact@v4
110110
with:
111111
name: pytest-results-standalone-${{matrix.connection-type}}-${{matrix.python-version}}
112112
path: |
113-
combined-coverage.xml
113+
.coverage
114114
prof/**
115115
profile_output*
116116
if-no-files-found: error
@@ -166,14 +166,14 @@ jobs:
166166
invoke cluster-tests --protocol=3
167167
168168
- name: Combine test coverage
169-
run: coverage combine combined-coverage.xml coverage/
169+
run: coverage combine -a coverage/
170170

171171
- name: Upload test results and profiling data
172172
uses: actions/upload-artifact@v4
173173
with:
174174
name: pytest-results-cluster-${{matrix.connection-type}}-${{matrix.python-version}}
175175
path: |
176-
combined-coverage.xml
176+
.coverage
177177
prof/**
178178
profile_output*
179179
if-no-files-found: error

tasks.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ def standalone_tests(c, uvloop=False, protocol=2, profile=False):
6262
profile_arg = "--profile" if profile else ""
6363
if uvloop:
6464
run(
65-
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_redis.xml -m 'not onlycluster' --uvloop --junit-xml=coverage/standalone-uvloop-results.xml"
65+
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_redis.xml -m 'not onlycluster' --uvloop --junit-xml=coverage/.coverage.standalone-uvloop-results.xml"
6666
)
6767
else:
6868
run(
69-
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_redis.xml -m 'not onlycluster' --junit-xml=coverage/standalone-results.xml"
69+
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_redis.xml -m 'not onlycluster' --junit-xml=coverage/.coverage.standalone-results.xml"
7070
)
7171

7272

@@ -77,11 +77,11 @@ def cluster_tests(c, uvloop=False, protocol=2, profile=False):
7777
cluster_url = "redis://localhost:16379/0"
7878
if uvloop:
7979
run(
80-
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_cluster.xml -m 'not onlynoncluster and not redismod' --redis-url={cluster_url} --junit-xml=coverage/cluster-uvloop-results.xml --uvloop"
80+
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_cluster.xml -m 'not onlynoncluster and not redismod' --redis-url={cluster_url} --junit-xml=coverage/.coverage.cluster-uvloop-results.xml --uvloop"
8181
)
8282
else:
8383
run(
84-
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_clusteclient.xml -m 'not onlynoncluster and not redismod' --redis-url={cluster_url} --junit-xml=coverage/cluster-results.xml"
84+
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_clusteclient.xml -m 'not onlynoncluster and not redismod' --redis-url={cluster_url} --junit-xml=coverage/.coverage.cluster-results.xml"
8585
)
8686

8787

0 commit comments

Comments
 (0)