Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Can't cancell CONTINUOUS audit"

Browse Source
This commit is contained in:
Zuul
2017-11-22 06:57:50 +00:00
committed by Gerrit Code Review
parent 2db668af30 55bd0fd038
commit cd045400ed
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
watcher/decision_engine/audit/continuous.py
View File

@@ -66,7 +66,7 @@ class ContinuousAuditHandler(base.AuditHandler):
[job for job in self.scheduler.get_jobs() [job for job in self.scheduler.get_jobs()
if job.name == 'execute_audit' and if job.name == 'execute_audit' and
job.args[0].uuid == audit.uuid][0].remove() job.args[0].uuid == audit.uuid][0].remove()
return True return True
return False return False
@@ -131,6 +131,9 @@ class ContinuousAuditHandler(base.AuditHandler):
scheduler_job_args = [ scheduler_job_args = [
job.args for job in self.scheduler.get_jobs() job.args for job in self.scheduler.get_jobs()
if job.name == 'execute_audit'] if job.name == 'execute_audit']
for args in scheduler_job_args:
if self._is_audit_inactive(args[0]):
scheduler_job_args.remove(args)
for audit in audits: for audit in audits:
# if audit is not presented in scheduled audits yet. # if audit is not presented in scheduled audits yet.
if audit.uuid not in [arg[0].uuid for arg in scheduler_job_args]: if audit.uuid not in [arg[0].uuid for arg in scheduler_job_args]:

2
watcher/tests/decision_engine/audit/test_audit_handlers.py
View File

@@ -377,7 +377,7 @@ class TestContinuousAuditHandler(base.DbTestCase):
audit_handler = continuous.ContinuousAuditHandler() audit_handler = continuous.ContinuousAuditHandler()
self.audits[0].next_run_time = (datetime.datetime.now() - self.audits[0].next_run_time = (datetime.datetime.now() -
datetime.timedelta(seconds=1800)) datetime.timedelta(seconds=1800))
m_is_inactive.return_value = True m_is_inactive.return_value = False
m_get_jobs.return_value = None m_get_jobs.return_value = None
audit_handler.execute_audit(self.audits[0], self.context) audit_handler.execute_audit(self.audits[0], self.context)