Skip to content

Commit 7e1cb62

Browse files
Desynchronize upb/pure tests
1 parent efd6942 commit 7e1cb62

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/test_upb.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,11 @@ jobs:
316316
# Test the first release of each python major version, plus some extra coverage for 3.x.y
317317
# since it predates our breaking change policies.
318318
# Major versions: 4.21.0, 5.26.0, 6.30.0
319-
version: ["3.19.0", "3.20.0", "21.0", "26.0"]
319+
version: ["3.18.0", "3.20.0", "21.0", "26.0"]
320320
implementation: ["Pure", "upb"]
321321
include:
322-
# We don't support 3.19.0 anymore, so our infra should show a failure.
323-
- version: "3.19.0"
322+
# We don't support 3.18.0 anymore, so our infra should show a failure.
323+
- version: "3.18.0"
324324
fail: true
325325
runs-on: ubuntu-latest
326326
if: ${{ github.event_name != 'pull_request_target' }}
@@ -362,7 +362,7 @@ jobs:
362362
run: chmod +x ci/python_compatibility.sh
363363
- name: Run compatibility tests
364364
if: ${{ inputs.continuous-run && !matrix.fail }}
365-
run: ci/python_compatibility.sh ${{ matrix.version }}
365+
run: ci/python_compatibility.sh ${{ matrix.version }} ${{ matrix.implementation == 'upb' && "pb_unit_tests.*py$" || "_test.py" }}
366366
- name: Run failing compatibility tests
367367
if: ${{ inputs.continuous-run && matrix.fail }}
368-
run: (! ci/python_compatibility.sh ${{ matrix.version }})
368+
run: (! ci/python_compatibility.sh ${{ matrix.version }}) ${{ matrix.implementation == 'upb' && "pb_unit_tests.*py$" || "_test.py" }}

ci/python_compatibility.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -ex
44

55
PROTOC_VERSION=$1
6+
TEST_FILTER=$1
67
PROTOC_DOWNLOAD=https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip
78
PY_SITE_PACKAGES=$(python -c 'import site; print(site.getsitepackages()[0])')
89

@@ -74,5 +75,5 @@ done
7475
# Exclude pybind11 tests because they require C++ code that doesn't ship with
7576
# our test wheels.
7677
TEST_EXCLUSIONS="_pybind11_test.py"
77-
TESTS=$(pip show -f protobuftests | grep -i _test.py | grep --invert-match $TEST_EXCLUSIONS | sed 's,/,.,g' | sed -E 's,.py$,,g')
78+
TESTS=$(pip show -f protobuftests | grep -i $TEST_FILTER | grep --invert-match $TEST_EXCLUSIONS | sed 's,/,.,g' | sed -E 's,.py$,,g')
7879
python -m unittest -v ${TESTS[@]}

0 commit comments

Comments
 (0)