From 1db58f9299c82acf8fb0d1edb3e74a37677bd8bb Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Fri, 10 Apr 2020 11:09:08 -0700 Subject: [PATCH 1/3] switch to regular flaky --- monitoring/api/v3/api-client/custom_metric_test.py | 2 +- monitoring/api/v3/api-client/list_resources_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monitoring/api/v3/api-client/custom_metric_test.py b/monitoring/api/v3/api-client/custom_metric_test.py index e2b0d8f366ca..5d51c15ec8f3 100644 --- a/monitoring/api/v3/api-client/custom_metric_test.py +++ b/monitoring/api/v3/api-client/custom_metric_test.py @@ -25,7 +25,7 @@ import time from gcp_devrel.testing import eventually_consistent -from gcp_devrel.testing.flaky import flaky +from flaky import flaky import googleapiclient.discovery import pytest diff --git a/monitoring/api/v3/api-client/list_resources_test.py b/monitoring/api/v3/api-client/list_resources_test.py index f2a9bbf035dc..5abeaeef82f7 100644 --- a/monitoring/api/v3/api-client/list_resources_test.py +++ b/monitoring/api/v3/api-client/list_resources_test.py @@ -23,7 +23,7 @@ import os import re -from gcp_devrel.testing.flaky import flaky +from flaky import flaky import googleapiclient.discovery import pytest From 9fbda121fad0c70d4f541230824f6d9f2db0f71a Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Fri, 10 Apr 2020 11:55:39 -0700 Subject: [PATCH 2/3] minor assertion adjustment --- monitoring/api/v3/api-client/list_resources_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/api/v3/api-client/list_resources_test.py b/monitoring/api/v3/api-client/list_resources_test.py index 5abeaeef82f7..217eb2d449a4 100644 --- a/monitoring/api/v3/api-client/list_resources_test.py +++ b/monitoring/api/v3/api-client/list_resources_test.py @@ -56,7 +56,7 @@ def test_list_metrics(client, capsys): client, PROJECT_RESOURCE, METRIC) stdout, _ = capsys.readouterr() regex = re.compile( - u'Delta CPU', re.I) + u'Delta vCPU', re.I) assert regex.search(stdout) is not None From ae9ff79de24a97bb9edd89e10de99d438958a658 Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Fri, 10 Apr 2020 13:51:03 -0700 Subject: [PATCH 3/3] address nit --- monitoring/api/v3/api-client/list_resources_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/api/v3/api-client/list_resources_test.py b/monitoring/api/v3/api-client/list_resources_test.py index 217eb2d449a4..95992bef21b1 100644 --- a/monitoring/api/v3/api-client/list_resources_test.py +++ b/monitoring/api/v3/api-client/list_resources_test.py @@ -56,7 +56,7 @@ def test_list_metrics(client, capsys): client, PROJECT_RESOURCE, METRIC) stdout, _ = capsys.readouterr() regex = re.compile( - u'Delta vCPU', re.I) + u'Delta', re.I) assert regex.search(stdout) is not None