Skip to content

Commit c684392

Browse files
authored
tests(monitoring): normalize VPCSC configuration in systests (#9615)
Toward #9580.
1 parent 24bacd0 commit c684392

File tree

2 files changed

+640
-627
lines changed

2 files changed

+640
-627
lines changed

packages/google-cloud-monitoring/noxfile.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,11 @@ def system(session):
121121
session.install("-e", "../test_utils/")
122122
session.install("-e", ".")
123123

124-
# Additional setup for VPCSC system tests
125-
in_vpc = os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC", "false")
126-
if in_vpc.lower() != "true":
127-
# Unset PROJECT_ID, since VPCSC system tests expect this to be a project
128-
# within the VPCSC perimeter.
129-
env = {
130-
"PROJECT_ID": "",
131-
"GOOGLE_CLOUD_TESTS_VPCSC_OUTSIDE_PERIMETER_PROJECT": os.environ.get("PROJECT_ID"),
132-
}
133-
134124
# Run py.test against the system tests.
135125
if system_test_exists:
136-
session.run("py.test", "--quiet", system_test_path, env=env, *session.posargs)
126+
session.run("py.test", "--quiet", system_test_path, *session.posargs)
137127
if system_test_folder_exists:
138-
session.run("py.test", "--quiet", system_test_folder_path, env=env, *session.posargs)
128+
session.run("py.test", "--quiet", system_test_folder_path, *session.posargs)
139129

140130

141131
@nox.session(python="3.7")

0 commit comments

Comments
 (0)