From 78c7f53cc55550250cac94331f84eee4f08da7e2 Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Fri, 3 Nov 2017 02:00:06 -0700 Subject: [PATCH 1/2] Fixed failed tests on Kokoro (Spanner + Translate) --- spanner/cloud-client/quickstart_test.py | 5 ++--- spanner/cloud-client/snippets.py | 2 +- translate/cloud-client/snippets_test.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spanner/cloud-client/quickstart_test.py b/spanner/cloud-client/quickstart_test.py index c2e42001b8d3..8b2c6435b9a3 100644 --- a/spanner/cloud-client/quickstart_test.py +++ b/spanner/cloud-client/quickstart_test.py @@ -16,7 +16,6 @@ from google.cloud import spanner import google.cloud.exceptions -import google.cloud.spanner.client import mock import pytest @@ -27,13 +26,13 @@ @pytest.fixture def patch_instance(): - original_instance = google.cloud.spanner.client.Client.instance + original_instance = spanner.Client.instance def new_instance(self, unused_instance_name): return original_instance(self, SPANNER_INSTANCE) instance_patch = mock.patch( - 'google.cloud.spanner.client.Client.instance', + 'google.cloud.spanner.Client.instance', side_effect=new_instance, autospec=True) diff --git a/spanner/cloud-client/snippets.py b/spanner/cloud-client/snippets.py index 61e5aff59509..380254ffad9f 100644 --- a/spanner/cloud-client/snippets.py +++ b/spanner/cloud-client/snippets.py @@ -194,7 +194,7 @@ def query_data_with_index( ALTER TABLE Albums ADD COLUMN MarketingBudget INT64 """ - from google.cloud.proto.spanner.v1 import type_pb2 + from google.cloud.spanner_v1.proto import type_pb2 spanner_client = spanner.Client() instance = spanner_client.instance(instance_id) diff --git a/translate/cloud-client/snippets_test.py b/translate/cloud-client/snippets_test.py index 153ee104a219..5123576698ad 100644 --- a/translate/cloud-client/snippets_test.py +++ b/translate/cloud-client/snippets_test.py @@ -46,4 +46,4 @@ def test_translate_utf8(capsys): text = u'나는 파인애플을 좋아한다.' snippets.translate_text('en', text) out, _ = capsys.readouterr() - assert u'I like pineapple.' in out + assert u'I like pineapples.' in out From 0af761c8f2de585f29074d82ab4f244beeb3619b Mon Sep 17 00:00:00 2001 From: michaelawyu Date: Fri, 3 Nov 2017 11:57:40 -0700 Subject: [PATCH 2/2] Update quickstart_test.py --- spanner/cloud-client/quickstart_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/spanner/cloud-client/quickstart_test.py b/spanner/cloud-client/quickstart_test.py index 8b2c6435b9a3..de2087250318 100644 --- a/spanner/cloud-client/quickstart_test.py +++ b/spanner/cloud-client/quickstart_test.py @@ -15,7 +15,6 @@ import os from google.cloud import spanner -import google.cloud.exceptions import mock import pytest