From 16fd1a9c9d6a753e77ab235cda8e739f2ba7fb9b Mon Sep 17 00:00:00 2001 From: Bill Prin Date: Fri, 10 Feb 2017 15:24:06 -0800 Subject: [PATCH 1/3] Fix monitoring tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Custom metric created doesn’t have a label. --- monitoring/api/v3/cloud-client/quickstart.py | 4 +--- monitoring/api/v3/cloud-client/snippets.py | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/monitoring/api/v3/cloud-client/quickstart.py b/monitoring/api/v3/cloud-client/quickstart.py index c814d2f519d..a899d7615cc 100644 --- a/monitoring/api/v3/cloud-client/quickstart.py +++ b/monitoring/api/v3/cloud-client/quickstart.py @@ -29,9 +29,7 @@ def run_quickstart(): metric = client.metric( type_='custom.googleapis.com/my_metric', - labels={ - 'status': 'successful', - } + labels={} ) client.write_point(metric, resource, 3.14) diff --git a/monitoring/api/v3/cloud-client/snippets.py b/monitoring/api/v3/cloud-client/snippets.py index e44d0d017ec..55042d13901 100644 --- a/monitoring/api/v3/cloud-client/snippets.py +++ b/monitoring/api/v3/cloud-client/snippets.py @@ -54,7 +54,6 @@ def write_time_series(): metric = client.metric( type_='custom.googleapis.com/my_metric', labels={ - 'status': 'successful', } ) client.write_point(metric, resource, 3.14) From 6acca5bce06413ebf2b805c08c6904882474a9fb Mon Sep 17 00:00:00 2001 From: Bill Prin Date: Fri, 10 Feb 2017 15:39:18 -0800 Subject: [PATCH 2/3] Replace test message --- monitoring/api/v3/cloud-client/snippets_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/api/v3/cloud-client/snippets_test.py b/monitoring/api/v3/cloud-client/snippets_test.py index e9fea4d176d..89f89241dd9 100644 --- a/monitoring/api/v3/cloud-client/snippets_test.py +++ b/monitoring/api/v3/cloud-client/snippets_test.py @@ -19,7 +19,7 @@ def test_create_get_delete_metric_descriptor(capsys): snippets.create_metric_descriptor() snippets.get_metric_descriptor('custom.googleapis.com/my_metric') out, _ = capsys.readouterr() - assert 'a simple example' in out + assert "value_type='STRING'" in out snippets.delete_metric_descriptor('custom.googleapis.com/my_metric') out, _ = capsys.readouterr() assert 'Deleted metric' in out From fb0f2182c3195a001c4be15858c16459d3126e02 Mon Sep 17 00:00:00 2001 From: Bill Prin Date: Fri, 10 Feb 2017 15:43:59 -0800 Subject: [PATCH 3/3] Fix message again --- monitoring/api/v3/cloud-client/snippets_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/api/v3/cloud-client/snippets_test.py b/monitoring/api/v3/cloud-client/snippets_test.py index 89f89241dd9..f87bcd03100 100644 --- a/monitoring/api/v3/cloud-client/snippets_test.py +++ b/monitoring/api/v3/cloud-client/snippets_test.py @@ -19,7 +19,7 @@ def test_create_get_delete_metric_descriptor(capsys): snippets.create_metric_descriptor() snippets.get_metric_descriptor('custom.googleapis.com/my_metric') out, _ = capsys.readouterr() - assert "value_type='STRING'" in out + assert "value_type='DOUBLE'" in out snippets.delete_metric_descriptor('custom.googleapis.com/my_metric') out, _ = capsys.readouterr() assert 'Deleted metric' in out