Skip to content

Commit 4754dc0

Browse files
committed
Remove coverage merge instead relies on multiple upload
1 parent ba6e5bc commit 4754dc0

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

.github/workflows/integration.yaml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ jobs:
7878

7979
- name: Build infrastructure
8080
run: |
81-
pip install coverage
8281
pip install -U setuptools wheel
8382
pip install -r requirements.txt
8483
pip install -r dev_requirements.txt
@@ -100,17 +99,12 @@ jobs:
10099
invoke standalone-tests --uvloop --protocol=3
101100
invoke standalone-tests --protocol=3
102101
103-
- name: Combine test coverage
104-
run: |
105-
ls -1
106-
coverage combine -a coverage/
107-
108102
- name: Upload test results and profiling data
109103
uses: actions/upload-artifact@v4
110104
with:
111105
name: pytest-results-standalone-${{matrix.connection-type}}-${{matrix.python-version}}
112106
path: |
113-
.coverage
107+
coverage/*
114108
prof/**
115109
profile_output*
116110
if-no-files-found: error
@@ -143,7 +137,6 @@ jobs:
143137

144138
- name: Build infrastructure
145139
run: |
146-
pip install coverage
147140
pip install -U setuptools wheel
148141
pip install -r requirements.txt
149142
pip install -r dev_requirements.txt
@@ -165,15 +158,12 @@ jobs:
165158
invoke cluster-tests --uvloop --protocol=3
166159
invoke cluster-tests --protocol=3
167160
168-
- name: Combine test coverage
169-
run: coverage combine -a coverage/
170-
171161
- name: Upload test results and profiling data
172162
uses: actions/upload-artifact@v4
173163
with:
174164
name: pytest-results-cluster-${{matrix.connection-type}}-${{matrix.python-version}}
175165
path: |
176-
.coverage
166+
coverage/*
177167
prof/**
178168
profile_output*
179169
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/.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/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/.coverage.standalone-results.xml"
69+
f"pytest {profile_arg} --protocol={protocol} --cov=./ --cov-report=xml:coverage_redis.xml -m 'not onlycluster' --junit-xml=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/.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/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/.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/cluster-results.xml"
8585
)
8686

8787

0 commit comments

Comments
 (0)