Skip to content

switch to regular flaky in monitoring #3333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 10, 2020
Merged

switch to regular flaky in monitoring #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1db58f9
switch to regular flaky
leahecole Apr 10, 2020
9fbda12
minor assertion adjustment
leahecole Apr 10, 2020
6fa5135
Merge branch 'master' into flaky_monitoring
leahecole Apr 10, 2020
ae9ff79
address nit
leahecole Apr 10, 2020
cc5a519
Merge branch 'master' into flaky_monitoring
leahecole Apr 10, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion monitoring/api/v3/api-client/custom_metric_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions monitoring/api/v3/api-client/list_resources_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import os
import re

from gcp_devrel.testing.flaky import flaky
from flaky import flaky
import googleapiclient.discovery
import pytest

Expand Down Expand Up @@ -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', re.I)
assert regex.search(stdout) is not None


Expand Down