Skip to content

Commit a791fc6

Browse files
dhermesdhermes
committed
Putting delimiter in front (will be squashed after review).
1 parent 961c002 commit a791fc6

File tree

5 files changed

+21
-20
lines changed

5 files changed

+21
-20
lines changed

‎system_tests/bigquery.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def test_load_table_from_storage_then_dump_table(self):
262262
import tempfile
263263
from gcloud.storage import Client as StorageClient
264264
local_id = unique_resource_id()
265-
BUCKET_NAME = 'bq_load_test_' + local_id
265+
BUCKET_NAME = 'bq_load_test' + local_id
266266
BLOB_NAME = 'person_ages.csv'
267267
GS_URL = 'gs://%s/%s' % (BUCKET_NAME, BLOB_NAME)
268268
ROWS = [

‎system_tests/logging_.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424

2525

2626
_RESOURCE_ID = unique_resource_id('-')
27-
DEFAULT_METRIC_NAME = 'system-tests-metric-%s' % (_RESOURCE_ID,)
28-
DEFAULT_SINK_NAME = 'system-tests-sink-%s' % (_RESOURCE_ID,)
27+
DEFAULT_METRIC_NAME = 'system-tests-metric%s' % (_RESOURCE_ID,)
28+
DEFAULT_SINK_NAME = 'system-tests-sink%s' % (_RESOURCE_ID,)
2929
DEFAULT_FILTER = 'logName:syslog AND severity>=INFO'
3030
DEFAULT_DESCRIPTION = 'System testing'
31-
BUCKET_NAME = 'gcloud-python-system-testing-%s' % (_RESOURCE_ID,)
32-
DATASET_NAME = 'system_testing_dataset_%s' % (_RESOURCE_ID,)
33-
TOPIC_NAME = 'gcloud-python-system-testing-%s' % (_RESOURCE_ID,)
31+
BUCKET_NAME = 'gcloud-python-system-testing%s' % (_RESOURCE_ID,)
32+
DATASET_NAME = ('system_testing_dataset' + _RESOURCE_ID).replace('-', '_')
33+
TOPIC_NAME = 'gcloud-python-system-testing%s' % (_RESOURCE_ID,)
3434

3535

3636
class Config(object):
@@ -68,7 +68,7 @@ def tearDown(self):
6868

6969
@staticmethod
7070
def _logger_name():
71-
return 'system-tests-logger-' + unique_resource_id('-')
71+
return 'system-tests-logger' + unique_resource_id('-')
7272

7373
def test_log_text(self):
7474
TEXT_PAYLOAD = 'System test: test_log_text'

‎system_tests/pubsub.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from system_test_utils import unique_resource_id
2828

2929

30-
DEFAULT_TOPIC_NAME = 'subscribe-me' + unique_resource_id()
30+
DEFAULT_TOPIC_NAME = 'subscribe-me' + unique_resource_id('-')
3131

3232

3333
class Config(object):
@@ -60,7 +60,7 @@ def tearDown(self):
6060
doomed.delete()
6161

6262
def test_create_topic(self):
63-
topic_name = 'a-new-topic' + unique_resource_id()
63+
topic_name = 'a-new-topic' + unique_resource_id('-')
6464
topic = Config.CLIENT.topic(topic_name)
6565
self.assertFalse(topic.exists())
6666
topic.create()
@@ -91,7 +91,7 @@ def test_create_subscription_defaults(self):
9191
self.assertFalse(topic.exists())
9292
topic.create()
9393
self.to_delete.append(topic)
94-
SUBSCRIPTION_NAME = 'subscribing-now-' + unique_resource_id()
94+
SUBSCRIPTION_NAME = 'subscribing-now' + unique_resource_id('-')
9595
subscription = topic.subscription(SUBSCRIPTION_NAME)
9696
self.assertFalse(subscription.exists())
9797
subscription.create()
@@ -105,7 +105,7 @@ def test_create_subscription_w_ack_deadline(self):
105105
self.assertFalse(topic.exists())
106106
topic.create()
107107
self.to_delete.append(topic)
108-
SUBSCRIPTION_NAME = 'subscribing-now-' + unique_resource_id()
108+
SUBSCRIPTION_NAME = 'subscribing-now' + unique_resource_id()
109109
subscription = topic.subscription(SUBSCRIPTION_NAME, ack_deadline=120)
110110
self.assertFalse(subscription.exists())
111111
subscription.create()
@@ -144,7 +144,7 @@ def test_message_pull_mode_e2e(self):
144144
self.assertFalse(topic.exists())
145145
topic.create()
146146
self.to_delete.append(topic)
147-
SUBSCRIPTION_NAME = 'subscribing-now-' + unique_resource_id()
147+
SUBSCRIPTION_NAME = 'subscribing-now' + unique_resource_id('-')
148148
subscription = topic.subscription(SUBSCRIPTION_NAME)
149149
self.assertFalse(subscription.exists())
150150
subscription.create()
@@ -172,7 +172,7 @@ def _by_timestamp(message):
172172
self.assertEqual(message2.attributes['extra'], EXTRA_2)
173173

174174
def test_topic_iam_policy(self):
175-
topic_name = 'test-topic-iam-policy-topic-' + unique_resource_id()
175+
topic_name = 'test-topic-iam-policy-topic' + unique_resource_id('-')
176176
topic = Config.CLIENT.topic(topic_name)
177177
topic.create()
178178
count = 5
@@ -187,7 +187,7 @@ def test_topic_iam_policy(self):
187187
self.assertEqual(new_policy.viewers, policy.viewers)
188188

189189
def test_subscription_iam_policy(self):
190-
topic_name = 'test-sub-iam-policy-topic-' + unique_resource_id()
190+
topic_name = 'test-sub-iam-policy-topic' + unique_resource_id('-')
191191
topic = Config.CLIENT.topic(topic_name)
192192
topic.create()
193193
count = 5
@@ -196,7 +196,7 @@ def test_subscription_iam_policy(self):
196196
count -= 1
197197
self.assertTrue(topic.exists())
198198
self.to_delete.append(topic)
199-
SUB_NAME = 'test-sub-iam-policy-sub-' + unique_resource_id()
199+
SUB_NAME = 'test-sub-iam-policy-sub' + unique_resource_id('-')
200200
subscription = topic.subscription(SUB_NAME)
201201
subscription.create()
202202
count = 5
@@ -211,8 +211,8 @@ def test_subscription_iam_policy(self):
211211
self.assertEqual(new_policy.viewers, policy.viewers)
212212

213213
def test_fetch_delete_subscription_w_deleted_topic(self):
214-
TO_DELETE = 'delete-me-' + unique_resource_id()
215-
ORPHANED = 'orphaned-' + unique_resource_id()
214+
TO_DELETE = 'delete-me' + unique_resource_id('-')
215+
ORPHANED = 'orphaned' + unique_resource_id('-')
216216
topic = Config.CLIENT.topic(TO_DELETE)
217217
topic.create()
218218
subscription = topic.subscription(ORPHANED)

‎system_tests/storage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def tearDown(self):
6666
Config.CLIENT.bucket(bucket_name).delete()
6767

6868
def test_create_bucket(self):
69-
new_bucket_name = 'a-new-bucket' + unique_resource_id()
69+
new_bucket_name = 'a-new-bucket' + unique_resource_id('-')
7070
self.assertRaises(exceptions.NotFound,
7171
Config.CLIENT.get_bucket, new_bucket_name)
7272
created = Config.CLIENT.create_bucket(new_bucket_name)

‎system_tests/system_test_utils.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ def unique_resource_id(delimiter='_'):
6767
"""
6868
build_id = os.getenv('TRAVIS_BUILD_ID', '')
6969
if build_id == '':
70-
return '%d' % (1000 * time.time(),)
70+
return '%s%d' % (delimiter, 1000 * time.time())
7171
else:
72-
return '%d%s%s' % (time.time(), delimiter, build_id)
72+
return '%s%d%s%s' % (delimiter, time.time(),
73+
delimiter, build_id)

0 commit comments

Comments
 (0)