This is an automated email from the ASF dual-hosted git repository.

chamikara pushed a commit to branch transform_service_test_suite
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/transform_service_test_suite 
by this push:
     new 3696832f54b updates
3696832f54b is described below

commit 3696832f54bc4831a5dfd7fba7eb79e2c9b76d95
Author: Chamikara Jayalath <[email protected]>
AuthorDate: Mon Mar 4 13:53:17 2024 -0800

    updates
---
 .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy |  2 +-
 sdks/python/apache_beam/io/gcp/bigtableio_it_test.py      | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git 
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy 
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 6434746fd3a..fe36bb89cdc 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -2890,7 +2890,7 @@ class BeamModulePlugin implements Plugin<Project> {
           def cmdArgs = 
project.project(':sdks:python').mapToArgString(beamPythonTestPipelineOptions)
 
           project.exec {
-            environment "EXPANSION_PORT", externalPort
+            environment "TRANSFORM_SERVICE_PORT", externalPort
             executable 'sh'
             args '-c', ". $envDir/bin/activate && cd $pythonDir && 
./scripts/run_integration_test.sh $cmdArgs"
           }
diff --git a/sdks/python/apache_beam/io/gcp/bigtableio_it_test.py 
b/sdks/python/apache_beam/io/gcp/bigtableio_it_test.py
index 75f42f2968e..e4b573894bd 100644
--- a/sdks/python/apache_beam/io/gcp/bigtableio_it_test.py
+++ b/sdks/python/apache_beam/io/gcp/bigtableio_it_test.py
@@ -59,10 +59,11 @@ def instance_prefix(instance):
 @pytest.mark.uses_gcp_java_expansion_service
 @pytest.mark.uses_transform_service
 @unittest.skipIf(client is None, 'Bigtable dependencies are not installed')
-# @unittest.skipUnless(
-#     os.environ.get('EXPANSION_JARS'),
-#     "EXPANSION_JARS environment var is not provided, "
-#     "indicating that jars have not been built")
[email protected](
+    os.environ.get('EXPANSION_JARS') or
+    os.environ.get('TRANSFORM_SERVICE_PORT'),
+    "A valid expansion service is not available for executing the "
+    "cross-language test.")
 class TestReadFromBigTableIT(unittest.TestCase):
   INSTANCE = "bt-read-tests"
   TABLE_ID = "test-table"
@@ -150,10 +151,8 @@ class TestReadFromBigTableIT(unittest.TestCase):
 @pytest.mark.uses_gcp_java_expansion_service
 @pytest.mark.uses_transform_service
 @unittest.skipIf(client is None, 'Bigtable dependencies are not installed')
-# @unittest.skipUnless(
-#     os.environ.get('EXPANSION_JARS'),
-#     "EXPANSION_JARS environment var is not provided, "
-#     "indicating that jars have not been built")
+    "A valid expansion service is not available for executing the "
+    "cross-language test.")
 class TestWriteToBigtableXlangIT(unittest.TestCase):
   # These are integration tests for the cross-language write transform.
   INSTANCE = "bt-write-xlang"

Reply via email to