Monitoring: Fix environment variables for VPC tests. (#8302)

googleapis · Aug 22, 2019 · 5597542 · 5597542
1 parent 0cf4029
commit 5597542
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/noxfile.py b/noxfile.py
@@ -122,12 +122,13 @@ def system(session):
     session.install("-e", ".")
 
     # Additional setup for VPCSC system tests
-    env = {
-        "PROJECT_ID": "secure-gcp-test-project-4",
-        "GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT": os.environ.get(
-            "PROJECT_ID"
-        ),
-    }
+    if os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC") != "true":
+        # Unset PROJECT_ID, since VPCSC system tests expect this to be a project
+        # within the VPCSC perimeter.
+        env = {
+            "PROJECT_ID": "",
+            "GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT": os.environ.get("PROJECT_ID"),
+        }
 
     # Run py.test against the system tests.
     if system_test_exists:

diff --git a/tests/system/test_vpcsc.py b/tests/system/test_vpcsc.py
@@ -28,6 +28,8 @@
 from google.cloud.monitoring_v3 import enums
 
 PROJECT_INSIDE = os.environ.get("PROJECT_ID", None)
+if not PROJECT_INSIDE:
+    PROJECT_INSIDE = None
 PROJECT_OUTSIDE = os.environ.get(
     "GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT", None
 )