From 92634f747e27567129e7f376acddb8ce6cddc69e Mon Sep 17 00:00:00 2001 From: Hanwen Wu Date: Tue, 29 Oct 2019 13:24:27 -0400 Subject: [PATCH 1/5] Make VPCSC env comparison case-insensitive. --- monitoring/noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/noxfile.py b/monitoring/noxfile.py index 63a11673d3eb..34f2e4ae4048 100644 --- a/monitoring/noxfile.py +++ b/monitoring/noxfile.py @@ -122,7 +122,7 @@ def system(session): session.install("-e", ".") # Additional setup for VPCSC system tests - if os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC") != "true": + if os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC").lower() != "true": # Unset PROJECT_ID, since VPCSC system tests expect this to be a project # within the VPCSC perimeter. env = { From c28e0ed490252c0c5af8ce5b9bf73a112a7d2022 Mon Sep 17 00:00:00 2001 From: Hanwen Wu Date: Tue, 29 Oct 2019 13:28:45 -0400 Subject: [PATCH 2/5] Update noxfile.py --- monitoring/noxfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monitoring/noxfile.py b/monitoring/noxfile.py index 34f2e4ae4048..c4e9a88b43f2 100644 --- a/monitoring/noxfile.py +++ b/monitoring/noxfile.py @@ -122,7 +122,8 @@ def system(session): session.install("-e", ".") # Additional setup for VPCSC system tests - if os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC").lower() != "true": + in_vpc = os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC") + if !in_vpc or in_vpc.lower() != "true": # Unset PROJECT_ID, since VPCSC system tests expect this to be a project # within the VPCSC perimeter. env = { From 47229371f81bf4d39aa9bda26d0ce56c323ea1b1 Mon Sep 17 00:00:00 2001 From: Hanwen Wu Date: Tue, 29 Oct 2019 13:29:33 -0400 Subject: [PATCH 3/5] Update noxfile.py --- monitoring/noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/noxfile.py b/monitoring/noxfile.py index c4e9a88b43f2..f85fab899894 100644 --- a/monitoring/noxfile.py +++ b/monitoring/noxfile.py @@ -123,7 +123,7 @@ def system(session): # Additional setup for VPCSC system tests in_vpc = os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC") - if !in_vpc or in_vpc.lower() != "true": + if not in_vpc or in_vpc.lower() != "true": # Unset PROJECT_ID, since VPCSC system tests expect this to be a project # within the VPCSC perimeter. env = { From cee06dc7d1160fef70a150f5c9c93d48f8023354 Mon Sep 17 00:00:00 2001 From: Hanwen Wu Date: Thu, 31 Oct 2019 17:35:58 -0400 Subject: [PATCH 4/5] Update monitoring/noxfile.py Co-Authored-By: Tres Seaver --- monitoring/noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/noxfile.py b/monitoring/noxfile.py index f85fab899894..a677879d594c 100644 --- a/monitoring/noxfile.py +++ b/monitoring/noxfile.py @@ -122,7 +122,7 @@ def system(session): session.install("-e", ".") # Additional setup for VPCSC system tests - in_vpc = os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC") + in_vpc = os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC", "false") if not in_vpc or in_vpc.lower() != "true": # Unset PROJECT_ID, since VPCSC system tests expect this to be a project # within the VPCSC perimeter. From 649a9b87fbda78117b9af0c1e2f10a584aa93ed1 Mon Sep 17 00:00:00 2001 From: Hanwen Wu Date: Thu, 31 Oct 2019 17:36:06 -0400 Subject: [PATCH 5/5] Update monitoring/noxfile.py Co-Authored-By: Tres Seaver --- monitoring/noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/noxfile.py b/monitoring/noxfile.py index a677879d594c..4d766d958892 100644 --- a/monitoring/noxfile.py +++ b/monitoring/noxfile.py @@ -123,7 +123,7 @@ def system(session): # Additional setup for VPCSC system tests in_vpc = os.environ.get("GOOGLE_CLOUD_TESTS_IN_VPCSC", "false") - if not in_vpc or in_vpc.lower() != "true": + if in_vpc.lower() != "true": # Unset PROJECT_ID, since VPCSC system tests expect this to be a project # within the VPCSC perimeter. env = {