Factor shared constants / utility function out for DRY.

tseaver · tseaver · commit 3cdd037b473c · 2017-05-12T16:47:33.000-04:00
diff --git a/spanner/tests/system/utils/clear_streaming.py b/spanner/tests/system/utils/clear_streaming.py
@@ -14,20 +14,13 @@
 
 """Depopulate spanner databases with data for streaming system tests."""
 
-import os
-
 from google.cloud.spanner import Client
-from google.cloud.spanner.keyset import KeySet
 from google.cloud.spanner.pool import BurstyPool
 
-
-INSTANCE_NAME = 'gcp-streaming-systests'
-DATABASE_NAME = 'testing'
-
-
-def print_func(message):
-    if os.getenv('GOOGLE_CLOUD_NO_PRINT') != 'true':
-        print(message)
+# Import relative to the script's directory
+from streaming_utils import DATABASE_NAME
+from streaming_utils import INSTANCE_NAME
+from streaming_utils import print_func
 
 
 def remove_database(client):
diff --git a/spanner/tests/system/utils/populate_streaming.py b/spanner/tests/system/utils/populate_streaming.py
@@ -14,15 +14,14 @@
 
 """Populate spanner databases with data for streaming system tests."""
 
-import os
-
 from google.cloud.spanner import Client
 from google.cloud.spanner.keyset import KeySet
 from google.cloud.spanner.pool import BurstyPool
 
-
-INSTANCE_NAME = 'gcp-streaming-systests'
-DATABASE_NAME = 'testing'
+# Import relative to the script's directory
+from streaming_utils import DATABASE_NAME
+from streaming_utils import INSTANCE_NAME
+from streaming_utils import print_func
 
 DDL = """\
 CREATE TABLE four_kay (
@@ -47,11 +46,6 @@
 DDL_STATEMENTS = [stmt.strip() for stmt in DDL.split(';') if stmt.strip()]
 
 
-def print_func(message):
-    if os.getenv('GOOGLE_CLOUD_NO_PRINT') != 'true':
-        print(message)
-
-
 def ensure_database(client):
     instance = client.instance(INSTANCE_NAME)
 
diff --git a/spanner/tests/system/utils/streaming_utils.py b/spanner/tests/system/utils/streaming_utils.py
@@ -0,0 +1,24 @@
+# Copyright 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+
+INSTANCE_NAME = 'gcp-streaming-systests'
+DATABASE_NAME = 'testing'
+_SHOULD_PRINT = os.getenv('GOOGLE_CLOUD_NO_PRINT') != 'true'
+
+
+def print_func(message):
+    if _SHOULD_PRINT:
+        print(message)
