From eccd52182a0c08db4b736d1e23b89329cee469c2 Mon Sep 17 00:00:00 2001 From: Takashi Matsuo Date: Thu, 16 Apr 2020 18:05:30 -0700 Subject: [PATCH] add a filter to allow state = DONE --- dlp/jobs_test.py | 33 +++++++++++---------------------- dlp/requirements-test.txt | 2 +- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlp/jobs_test.py b/dlp/jobs_test.py index c21fcfa37b5c..b3910dd5b330 100644 --- a/dlp/jobs_test.py +++ b/dlp/jobs_test.py @@ -15,7 +15,6 @@ import os import uuid -import backoff import pytest import jobs @@ -62,31 +61,21 @@ def test_job_name(): def test_list_dlp_jobs(test_job_name, capsys): - @backoff.on_exception(backoff.expo, - AssertionError, - max_time=60) - def test_real(): - jobs.list_dlp_jobs(GCLOUD_PROJECT) + jobs.list_dlp_jobs(GCLOUD_PROJECT) - out, _ = capsys.readouterr() - assert test_job_name not in out - test_real() + out, _ = capsys.readouterr() + assert test_job_name not in out def test_list_dlp_jobs_with_filter(test_job_name, capsys): - @backoff.on_exception(backoff.expo, - AssertionError, - max_time=60) - def test_real(): - jobs.list_dlp_jobs( - GCLOUD_PROJECT, - filter_string="state=RUNNING", - job_type="RISK_ANALYSIS_JOB", - ) - - out, _ = capsys.readouterr() - assert test_job_name in out - test_real() + jobs.list_dlp_jobs( + GCLOUD_PROJECT, + filter_string="state=RUNNING OR state=DONE", + job_type="RISK_ANALYSIS_JOB", + ) + + out, _ = capsys.readouterr() + assert test_job_name in out def test_list_dlp_jobs_with_job_type(test_job_name, capsys): diff --git a/dlp/requirements-test.txt b/dlp/requirements-test.txt index 804438a024e0..5776d6748130 100644 --- a/dlp/requirements-test.txt +++ b/dlp/requirements-test.txt @@ -1,4 +1,4 @@ pytest==5.3.2 flaky==3.6.1 mock==3.0.5 -backoff==1.10.0 +