From 5adac18b36c63de8d09d60a901a97d9d5be26d63 Mon Sep 17 00:00:00 2001 From: Bill Prin Date: Wed, 13 Apr 2016 15:46:35 -0700 Subject: [PATCH] Mark Monitoring As Flaky --- monitoring/api/v3/custom_metric_test.py | 2 ++ monitoring/api/v3/list_resources_test.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/monitoring/api/v3/custom_metric_test.py b/monitoring/api/v3/custom_metric_test.py index 3d457de4d391..a326e43975a4 100644 --- a/monitoring/api/v3/custom_metric_test.py +++ b/monitoring/api/v3/custom_metric_test.py @@ -25,6 +25,7 @@ from custom_metric import create_custom_metric, get_custom_metric from custom_metric import read_timeseries, write_timeseries_value +from gcp.testing.flaky import flaky import list_resources """ Custom metric domain for all custom metrics""" @@ -37,6 +38,7 @@ CUSTOM_METRIC_DOMAIN, METRIC_NAME) +@flaky def test_custom_metric(cloud_config): PROJECT_RESOURCE = "projects/{}".format(cloud_config.project) client = list_resources.get_client() diff --git a/monitoring/api/v3/list_resources_test.py b/monitoring/api/v3/list_resources_test.py index 3669aa9f2c22..f4cf351e07bb 100644 --- a/monitoring/api/v3/list_resources_test.py +++ b/monitoring/api/v3/list_resources_test.py @@ -22,11 +22,13 @@ import re +from gcp.testing.flaky import flaky import list_resources METRIC = 'compute.googleapis.com/instance/cpu/usage_time' +@flaky def test_list_monitored_resources(cloud_config, capsys): PROJECT_RESOURCE = "projects/{}".format(cloud_config.project) client = list_resources.get_client() @@ -38,6 +40,7 @@ def test_list_monitored_resources(cloud_config, capsys): assert regex.search(stdout) is not None +@flaky def test_list_metrics(cloud_config, capsys): PROJECT_RESOURCE = "projects/{}".format(cloud_config.project) client = list_resources.get_client() @@ -49,6 +52,7 @@ def test_list_metrics(cloud_config, capsys): assert regex.search(stdout) is not None +@flaky def test_list_timeseries(cloud_config, capsys): PROJECT_RESOURCE = "projects/{}".format(cloud_config.project) client = list_resources.get_client()