From 9455bf2289899824e7da451c986d75aaa7c44ff4 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 14 Jan 2016 21:08:07 -0800 Subject: [PATCH] Fixing import error of a no longer existing generated pb2. Caused by merging #1353 before #1329. --- gcloud/test__helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcloud/test__helpers.py b/gcloud/test__helpers.py index 0a3b4ace0dec..88ee82b5c4a8 100644 --- a/gcloud/test__helpers.py +++ b/gcloud/test__helpers.py @@ -546,9 +546,9 @@ def test_set_simple_field(self): self.assertTrue(self._callFUT(cluster_pb, 'serve_nodes')) def test_unset_message_field(self): + from google.protobuf.timestamp_pb2 import Timestamp from gcloud.bigtable._generated import ( bigtable_cluster_data_pb2 as data_pb2) - from gcloud.bigtable._generated.timestamp_pb2 import Timestamp cluster_pb = data_pb2.Cluster() # Check that no fields are attached to the protobuf message. self.assertEqual(len(cluster_pb._fields), 0) @@ -561,9 +561,9 @@ def test_unset_message_field(self): self.assertFalse(self._callFUT(cluster_pb, 'delete_time')) def test_set_message_field(self): + from google.protobuf.timestamp_pb2 import Timestamp from gcloud.bigtable._generated import ( bigtable_cluster_data_pb2 as data_pb2) - from gcloud.bigtable._generated.timestamp_pb2 import Timestamp timestamp = Timestamp() cluster_pb = data_pb2.Cluster(delete_time=timestamp)