From 035f9c7274aa2a5ef11214b0004529091bb335ef Mon Sep 17 00:00:00 2001 From: Maximus Date: Mon, 23 Sep 2019 17:19:39 -0700 Subject: [PATCH 1/7] test(dlp): fix potentially unsent env variable and enable skipped tests. Tests can potentially break if GOOGLE_CLOUD_TESTS_IN_VPCSC is false. Additionally, we want to enable previously skipped tests to ensure all VPC checks are working for list tests. --- dlp/noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlp/noxfile.py b/dlp/noxfile.py index fd63f02fe89b..f52153dd2dc2 100644 --- a/dlp/noxfile.py +++ b/dlp/noxfile.py @@ -119,7 +119,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", "false").lower() != "true": # Unset PROJECT_ID, since VPCSC system tests expect this to be a project # within the VPCSC perimeter. env = { From 5ace2572994c568441aab2325185063159b7bb3b Mon Sep 17 00:00:00 2001 From: maximus12793 Date: Tue, 24 Sep 2019 00:43:48 +0000 Subject: [PATCH 2/7] Remove list skips --- .../system/gapic/v2/test_system_dlp_service_v2_vpcsc.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py index 2dce7a68e0d0..92d9b4aea7c4 100644 --- a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py +++ b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py @@ -163,7 +163,6 @@ def test_get_inspect_template(self): delayed_outside = lambda: client.get_inspect_template(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -244,7 +243,6 @@ def test_get_deidentify_template(self): delayed_outside = lambda: client.get_deidentify_template(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -293,7 +291,6 @@ def test_create_dlp_job(self): delayed_outside = lambda: client.create_dlp_job(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -358,7 +355,6 @@ def test_cancel_dlp_job(self): delayed_outside = lambda: client.cancel_dlp_job(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -487,7 +483,6 @@ def test_get_stored_info_type(self): delayed_outside = lambda: client.get_stored_info_type(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", From f8b1cc1a925f2b35221b702b4f9d51dfbe403d90 Mon Sep 17 00:00:00 2001 From: maximus12793 Date: Fri, 11 Oct 2019 17:34:16 +0000 Subject: [PATCH 3/7] fix typo deidentify content --- dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py index 92d9b4aea7c4..14d2bd3555b5 100644 --- a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py +++ b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py @@ -96,7 +96,7 @@ def test_deidentify_content(self): name_inside = client.project_path(PROJECT_INSIDE) delayed_inside = lambda: client.deidentify_content(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) - delayed_outside = lambda: client.deidentify_conent(name_outside) + delayed_outside = lambda: client.deidentify_content(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( From 854491d62f2885a5b477c70ceadf91e97fc2bde6 Mon Sep 17 00:00:00 2001 From: Maximus Date: Fri, 11 Oct 2019 10:35:48 -0700 Subject: [PATCH 4/7] Update test_system_dlp_service_v2_vpcsc.py fix typo with deidentify content --- dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py index 92d9b4aea7c4..14d2bd3555b5 100644 --- a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py +++ b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py @@ -96,7 +96,7 @@ def test_deidentify_content(self): name_inside = client.project_path(PROJECT_INSIDE) delayed_inside = lambda: client.deidentify_content(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) - delayed_outside = lambda: client.deidentify_conent(name_outside) + delayed_outside = lambda: client.deidentify_content(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( From 6e105032a3cd92c70a87728b1ea89be74956fe2a Mon Sep 17 00:00:00 2001 From: maximus12793 Date: Tue, 15 Oct 2019 23:27:48 +0000 Subject: [PATCH 5/7] fix typo --- .../system/gapic/v2/test_system_dlp_service_v2_vpcsc.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py index 14d2bd3555b5..2dce7a68e0d0 100644 --- a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py +++ b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py @@ -96,7 +96,7 @@ def test_deidentify_content(self): name_inside = client.project_path(PROJECT_INSIDE) delayed_inside = lambda: client.deidentify_content(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) - delayed_outside = lambda: client.deidentify_content(name_outside) + delayed_outside = lambda: client.deidentify_conent(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( @@ -163,6 +163,7 @@ def test_get_inspect_template(self): delayed_outside = lambda: client.get_inspect_template(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) + @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -243,6 +244,7 @@ def test_get_deidentify_template(self): delayed_outside = lambda: client.get_deidentify_template(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) + @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -291,6 +293,7 @@ def test_create_dlp_job(self): delayed_outside = lambda: client.create_dlp_job(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) + @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -355,6 +358,7 @@ def test_cancel_dlp_job(self): delayed_outside = lambda: client.cancel_dlp_job(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) + @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -483,6 +487,7 @@ def test_get_stored_info_type(self): delayed_outside = lambda: client.get_stored_info_type(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) + @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", From 89e2ce95e38c0500b5276ce8135e0ef9cd8f2944 Mon Sep 17 00:00:00 2001 From: maximus12793 Date: Tue, 15 Oct 2019 23:29:03 +0000 Subject: [PATCH 6/7] fix typo --- dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py index 2dce7a68e0d0..f075044d00e1 100644 --- a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py +++ b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py @@ -96,7 +96,7 @@ def test_deidentify_content(self): name_inside = client.project_path(PROJECT_INSIDE) delayed_inside = lambda: client.deidentify_content(name_inside) name_outside = client.project_path(PROJECT_OUTSIDE) - delayed_outside = lambda: client.deidentify_conent(name_outside) + delayed_outside = lambda: client.deidentify_content(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) @pytest.mark.skipif( From 0524e35c4b307d52dfc67e42aa3b81a8746f6d0d Mon Sep 17 00:00:00 2001 From: Maximilian Roquemore Date: Tue, 22 Oct 2019 17:55:55 +0000 Subject: [PATCH 7/7] temp --- .../system/gapic/v2/test_system_dlp_service_v2_vpcsc.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py index f075044d00e1..14d2bd3555b5 100644 --- a/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py +++ b/dlp/tests/system/gapic/v2/test_system_dlp_service_v2_vpcsc.py @@ -163,7 +163,6 @@ def test_get_inspect_template(self): delayed_outside = lambda: client.get_inspect_template(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -244,7 +243,6 @@ def test_get_deidentify_template(self): delayed_outside = lambda: client.get_deidentify_template(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -293,7 +291,6 @@ def test_create_dlp_job(self): delayed_outside = lambda: client.create_dlp_job(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -358,7 +355,6 @@ def test_cancel_dlp_job(self): delayed_outside = lambda: client.cancel_dlp_job(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC", @@ -487,7 +483,6 @@ def test_get_stored_info_type(self): delayed_outside = lambda: client.get_stored_info_type(name_outside) TestSystemDlpService._do_test(delayed_inside, delayed_outside) - @pytest.mark.skip(reason="List tests are currently not supported") @pytest.mark.skipif( not IS_INSIDE_VPCSC, reason="This test requires a VPCSC and setting GOOGLE_CLOUD_TESTS_IN_VPCSC",