From 06d05d5886bd2290f2b93b712a5362949d1cb718 Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Mon, 6 Nov 2017 18:21:20 -0800 Subject: [PATCH 1/4] Fixed Lint Error --- dataproc/submit_job_to_cluster.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataproc/submit_job_to_cluster.py b/dataproc/submit_job_to_cluster.py index ab833f02fcb2..1815078202f3 100644 --- a/dataproc/submit_job_to_cluster.py +++ b/dataproc/submit_job_to_cluster.py @@ -82,7 +82,7 @@ def create_cluster(dataproc, project, zone, region, cluster_name): 'machineTypeUri': 'n1-standard-1' }, 'workerConfig': { - 'numInstances' : 2, + 'numInstances': 2, 'machineTypeUri': 'n1-standard-1' } } From 40b0042d812714ad76b7a82afccc66e4efe00945 Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Mon, 6 Nov 2017 18:25:57 -0800 Subject: [PATCH 2/4] Update dataproc_e2e_test.py --- dataproc/dataproc_e2e_test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dataproc/dataproc_e2e_test.py b/dataproc/dataproc_e2e_test.py index b83b2b6de264..2b4ae662534e 100644 --- a/dataproc/dataproc_e2e_test.py +++ b/dataproc/dataproc_e2e_test.py @@ -20,11 +20,14 @@ import submit_job_to_cluster +from gcp_devrel.testing.flaky import flaky + PROJECT = os.environ['GCLOUD_PROJECT'] BUCKET = os.environ['CLOUD_STORAGE_BUCKET'] CLUSTER_NAME = 'testcluster3' ZONE = 'us-central1-b' +@flaky def test_e2e(): output = submit_job_to_cluster.main( PROJECT, ZONE, CLUSTER_NAME, BUCKET) From 0755aa65d0686d4203083a6ad5fafb8df05c4c6f Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Mon, 6 Nov 2017 18:26:30 -0800 Subject: [PATCH 3/4] Update dataproc_e2e_test.py --- dataproc/dataproc_e2e_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataproc/dataproc_e2e_test.py b/dataproc/dataproc_e2e_test.py index 2b4ae662534e..9f7ba4cf5d52 100644 --- a/dataproc/dataproc_e2e_test.py +++ b/dataproc/dataproc_e2e_test.py @@ -18,10 +18,10 @@ import os -import submit_job_to_cluster - from gcp_devrel.testing.flaky import flaky +import submit_job_to_cluster + PROJECT = os.environ['GCLOUD_PROJECT'] BUCKET = os.environ['CLOUD_STORAGE_BUCKET'] CLUSTER_NAME = 'testcluster3' From ac096571a6570618d4bdcd06e2b9e0c73fb4593f Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Mon, 6 Nov 2017 18:31:13 -0800 Subject: [PATCH 4/4] Fixing More Lint Errors --- dataproc/dataproc_e2e_test.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dataproc/dataproc_e2e_test.py b/dataproc/dataproc_e2e_test.py index 9f7ba4cf5d52..0a45d080122f 100644 --- a/dataproc/dataproc_e2e_test.py +++ b/dataproc/dataproc_e2e_test.py @@ -18,8 +18,6 @@ import os -from gcp_devrel.testing.flaky import flaky - import submit_job_to_cluster PROJECT = os.environ['GCLOUD_PROJECT'] @@ -27,7 +25,7 @@ CLUSTER_NAME = 'testcluster3' ZONE = 'us-central1-b' -@flaky + def test_e2e(): output = submit_job_to_cluster.main( PROJECT, ZONE, CLUSTER_NAME, BUCKET)