From c190be428f8528963feebbeccce325336934e613 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Fri, 10 Jul 2015 14:37:58 -0700 Subject: [PATCH] Fix datastore test plumbing modules. This were broken by the change to clients from implicit behavior. --- system_tests/clear_datastore.py | 9 +++++---- system_tests/populate_datastore.py | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/system_tests/clear_datastore.py b/system_tests/clear_datastore.py index 07bcafd8d060..32f4e0873031 100644 --- a/system_tests/clear_datastore.py +++ b/system_tests/clear_datastore.py @@ -21,6 +21,7 @@ _implicit_environ._DATASET_ENV_VAR_NAME = 'GCLOUD_TESTS_DATASET_ID' +CLIENT = datastore.Client() FETCH_MAX = 20 @@ -36,7 +37,7 @@ def fetch_keys(kind, fetch_max=FETCH_MAX, query=None, cursor=None): if query is None: - query = datastore.Query(kind=kind, projection=['__key__']) + query = CLIENT.query(kind=kind, projection=['__key__']) iterator = query.fetch(limit=fetch_max, start_cursor=cursor) @@ -65,7 +66,7 @@ def remove_kind(kind): return delete_outside_transaction = False - with datastore.Transaction(): + with CLIENT.transaction(): # Now that we have all results, we seek to delete. print('Deleting keys:') print(results) @@ -74,10 +75,10 @@ def remove_kind(kind): if len(ancestors) > TRANSACTION_MAX_GROUPS: delete_outside_transaction = True else: - datastore.delete_multi([result.key for result in results]) + CLIENT.delete_multi([result.key for result in results]) if delete_outside_transaction: - datastore.delete_multi([result.key for result in results]) + CLIENT.delete_multi([result.key for result in results]) def remove_all_entities(): diff --git a/system_tests/populate_datastore.py b/system_tests/populate_datastore.py index 7456cf997a13..5c4dc8895acf 100644 --- a/system_tests/populate_datastore.py +++ b/system_tests/populate_datastore.py @@ -21,6 +21,7 @@ _implicit_environ._DATASET_ENV_VAR_NAME = 'GCLOUD_TESTS_DATASET_ID' +CLIENT = datastore.Client() ANCESTOR = ('Book', 'GoT') @@ -82,12 +83,12 @@ def add_characters(): - with datastore.Transaction() as xact: + with CLIENT.transaction() as xact: for key_path, character in zip(KEY_PATHS, CHARACTERS): if key_path[-1] != character['name']: raise ValueError(('Character and key don\'t agree', key_path, character)) - entity = datastore.Entity(key=datastore.Key(*key_path)) + entity = datastore.Entity(key=CLIENT.key(*key_path)) entity.update(character) xact.put(entity) print('Adding Character %s %s' % (character['name'],