Merge branch 'master' into gae-requests

GoogleCloudPlatform · Apr 13, 2016 · 3d75b3d · 3d75b3d
2 parents 2983426 + db0d35a
commit 3d75b3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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()