Skip to content

[Do Not Merge] Use Tox parallelism in unit test #7570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
markflyhigh wants to merge 1 commit into from
Closed

[Do Not Merge] Use Tox parallelism in unit test #7570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ class BeamModulePlugin implements Plugin<Project> {
project.exec { commandLine 'virtualenv', "${project.ext.envdir}" }
project.exec {
executable 'sh'
args '-c', ". ${project.ext.envdir}/bin/activate && pip install --retries 10 --upgrade tox==3.0.0 grpcio-tools==1.3.5"
args '-c', ". ${project.ext.envdir}/bin/activate && pip install --retries 10 --upgrade tox==3.7.0 grpcio-tools==1.3.5"
}
}
// Gradle will delete outputs whenever it thinks they are stale. Putting a
Expand Down
8 changes: 3 additions & 5 deletions sdks/python/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,11 @@ assemble.dependsOn docs

toxTask "cover", "cover"

toxTask "testsInParallel", "py27,py3,py27-gcp,py27-lint,py27-lint3,py3-lint,docs"

task preCommit() {
dependsOn "docs"
dependsOn "testsInParallel"
dependsOn "testCython"
dependsOn "testPython2"
dependsOn "testPython3"
dependsOn "testGcp"
dependsOn "lint"
}

task portablePreCommit() {
Expand Down
7 changes: 6 additions & 1 deletion sdks/python/scripts/run_tox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ if [[ "*sdks/python" != $PWD ]]; then
cd $(pwd | sed 's/sdks\/python.*/sdks\/python/')
fi

tox -c tox.ini --recreate -e $1
# check if multiple envs are provided. Then we can run them in parallel.
if [[ $1 == *","* ]]; then
parallel='-p all -o'
fi

tox -c tox.ini --recreate -e $1 $parallel
exit_code=$?
# Retry once for the specific exit code 245.
if [[ $exit_code == 245 ]]; then
Expand Down