From f9751fdf52e0785c8464864260e4d88d1f0b5600 Mon Sep 17 00:00:00 2001 From: Chad Dombrova Date: Fri, 13 Sep 2019 11:52:11 -0700 Subject: [PATCH] Exclude python 3-specific test files from running in post-commit --- sdks/python/apache_beam/testing/load_tests/build.gradle | 2 +- sdks/python/container/run_validatescontainer.sh | 2 +- sdks/python/scripts/run_integration_test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdks/python/apache_beam/testing/load_tests/build.gradle b/sdks/python/apache_beam/testing/load_tests/build.gradle index 5fb78ca35b6e..8eba17f15a06 100644 --- a/sdks/python/apache_beam/testing/load_tests/build.gradle +++ b/sdks/python/apache_beam/testing/load_tests/build.gradle @@ -47,7 +47,7 @@ task run(type: Exec, dependsOn: installGcpTest) { environment "LOAD_TEST_ENABLED", 'true' setWorkingDir "${project.rootDir}/sdks/python" - commandLine 'sh', '-c', "${project.ext.envdir}/bin/python setup.py nosetests --test-pipeline-options=\"${parseOptions(loadTestArgs)}\" --tests ${mainClass} --ignore-files \'.*py3.py\$\'" + commandLine 'sh', '-c', "${project.ext.envdir}/bin/python setup.py nosetests --test-pipeline-options=\"${parseOptions(loadTestArgs)}\" --tests ${mainClass} --ignore-files \'.*py3\\d?\\.py\$\'" ignoreExitValue true doLast { diff --git a/sdks/python/container/run_validatescontainer.sh b/sdks/python/container/run_validatescontainer.sh index 068ce928488c..216d6170a8ed 100755 --- a/sdks/python/container/run_validatescontainer.sh +++ b/sdks/python/container/run_validatescontainer.sh @@ -125,7 +125,7 @@ python setup.py nosetests \ --process-timeout=900 \ --with-xunitmp \ --xunitmp-file=$XUNIT_FILE \ - --ignore-files '.*py3.py$' \ + --ignore-files '.*py3\d?\.py$' \ --test-pipeline-options=" \ --runner=TestDataflowRunner \ --project=$PROJECT \ diff --git a/sdks/python/scripts/run_integration_test.sh b/sdks/python/scripts/run_integration_test.sh index 586d3382e3d6..11331471c046 100755 --- a/sdks/python/scripts/run_integration_test.sh +++ b/sdks/python/scripts/run_integration_test.sh @@ -246,5 +246,5 @@ echo ">>> test options: $TEST_OPTS" python setup.py nosetests \ --test-pipeline-options="$PIPELINE_OPTS" \ --with-xunitmp --xunitmp-file=$XUNIT_FILE \ - --ignore-files '.*py3.py$' \ + --ignore-files '.*py3\d?\.py$' \ $TEST_OPTS