Skip to content

Commit 4d21791

Browse files
committed
Merge pull request #1611 from tseaver/logging-system_test-client_list_metrics
Add system test for 'Client.list_metrics'.
2 parents 93443d1 + 61004b7 commit 4d21791

File tree

4 files changed

+19
-21
lines changed

4 files changed

+19
-21
lines changed

gcloud/logging/metric.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,8 @@ def from_api_repr(cls, resource, client):
106106
107107
:rtype: :class:`gcloud.logging.metric.Metric`
108108
:returns: Metric parsed from ``resource``.
109-
:raises: :class:`ValueError` if ``client`` is not ``None`` and the
110-
project from the resource does not agree with the project
111-
from the client.
112109
"""
113-
metric_name = _metric_name_from_path(resource['name'], client.project)
110+
metric_name = resource['name']
114111
filter_ = resource['filter']
115112
description = resource.get('description', '')
116113
return cls(metric_name, filter_, client=client,

gcloud/logging/test_client.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,9 @@ def test_list_metrics_no_paging(self):
294294

295295
CLIENT_OBJ = self._makeOne(project=PROJECT, credentials=CREDS)
296296

297-
METRIC_PATH = 'projects/%s/metrics/%s' % (PROJECT, self.METRIC_NAME)
298-
299297
RETURNED = {
300298
'metrics': [{
301-
'name': METRIC_PATH,
299+
'name': self.METRIC_NAME,
302300
'filter': self.FILTER,
303301
'description': self.DESCRIPTION,
304302
}],
@@ -329,13 +327,12 @@ def test_list_metrics_with_paging(self):
329327

330328
CLIENT_OBJ = self._makeOne(project=PROJECT, credentials=CREDS)
331329

332-
METRIC_PATH = 'projects/%s/metrics/%s' % (PROJECT, self.METRIC_NAME)
333330
TOKEN1 = 'TOKEN1'
334331
TOKEN2 = 'TOKEN2'
335332
SIZE = 1
336333
RETURNED = {
337334
'metrics': [{
338-
'name': METRIC_PATH,
335+
'name': self.METRIC_NAME,
339336
'filter': self.FILTER,
340337
'description': self.DESCRIPTION,
341338
}],

gcloud/logging/test_metric.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def test_from_api_repr_minimal(self):
9292
CLIENT = _Client(project=self.PROJECT)
9393
FULL = 'projects/%s/metrics/%s' % (self.PROJECT, self.METRIC_NAME)
9494
RESOURCE = {
95-
'name': FULL,
95+
'name': self.METRIC_NAME,
9696
'filter': self.FILTER,
9797
}
9898
klass = self._getTargetClass()
@@ -109,7 +109,7 @@ def test_from_api_repr_w_description(self):
109109
FULL = 'projects/%s/metrics/%s' % (self.PROJECT, self.METRIC_NAME)
110110
DESCRIPTION = 'DESCRIPTION'
111111
RESOURCE = {
112-
'name': FULL,
112+
'name': self.METRIC_NAME,
113113
'filter': self.FILTER,
114114
'description': DESCRIPTION,
115115
}
@@ -122,16 +122,6 @@ def test_from_api_repr_w_description(self):
122122
self.assertEqual(metric.project, self.PROJECT)
123123
self.assertEqual(metric.full_name, FULL)
124124

125-
def test_from_api_repr_with_mismatched_project(self):
126-
PROJECT1 = 'PROJECT1'
127-
PROJECT2 = 'PROJECT2'
128-
CLIENT = _Client(project=PROJECT1)
129-
FULL = 'projects/%s/metrics/%s' % (PROJECT2, self.METRIC_NAME)
130-
RESOURCE = {'name': FULL, 'filter': self.FILTER}
131-
klass = self._getTargetClass()
132-
self.assertRaises(ValueError, klass.from_api_repr,
133-
RESOURCE, client=CLIENT)
134-
135125
def test_create_w_bound_client(self):
136126
TARGET = 'projects/%s/metrics' % (self.PROJECT,)
137127
RESOURCE = {

system_tests/logging_.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,17 @@ def test_create_metric(self):
8080
metric.create()
8181
self.to_delete.append(metric)
8282
self.assertTrue(metric.exists())
83+
84+
def test_list_metrics(self):
85+
metric = Config.CLIENT.metric(
86+
DEFAULT_METRIC_NAME, DEFAULT_FILTER, DEFAULT_DESCRIPTION)
87+
self.assertFalse(metric.exists())
88+
before_metrics, _ = Config.CLIENT.list_metrics()
89+
before_names = set(metric.name for metric in before_metrics)
90+
metric.create()
91+
self.to_delete.append(metric)
92+
self.assertTrue(metric.exists())
93+
after_metrics, _ = Config.CLIENT.list_metrics()
94+
after_names = set(metric.name for metric in after_metrics)
95+
self.assertEqual(after_names - before_names,
96+
set([DEFAULT_METRIC_NAME]))

0 commit comments

Comments
 (0)