zuul
/
zuul
Code Issues Proposed changes

Merge "Keep tenant_last_reconfigured float precision (time.sleep removal)"

This commit is contained in:
Zuul 2019-10-25 16:51:05 +00:00 committed by Gerrit Code Review
parent aa2ca7a304 dbf01dab90
commit b56d841e82
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/test_github_driver.py
View File

@ -846,7 +846,6 @@ class TestGithubDriver(ZuulTestCase):
# record previous tenant reconfiguration time, which may not be set
old = self.sched.tenant_last_reconfigured.get('tenant-one', 0)
time.sleep(1)
self.waitUntilSettled()
if expected_cat_jobs is not None:
@ -1286,7 +1285,6 @@ class TestGithubUnprotectedBranches(ZuulTestCase):
# record previous tenant reconfiguration time, which may not be set
old = self.sched.tenant_last_reconfigured.get('tenant-one', 0)
self.waitUntilSettled()
time.sleep(1)
self.fake_github.emitEvent(pevent)
self.waitUntilSettled()
@ -1329,7 +1327,6 @@ class TestGithubUnprotectedBranches(ZuulTestCase):
# record previous tenant reconfiguration time, which may not be set
old = self.sched.tenant_last_reconfigured.get('tenant-one', 0)
self.waitUntilSettled()
time.sleep(1)
# Delete the branch
repo._delete_branch('master')

2
tests/unit/test_pagure_driver.py
View File

@ -14,7 +14,6 @@
import re
import yaml
import time
import socket
from testtools.matchers import MatchesRegex
@ -207,7 +206,6 @@ class TestPagureDriver(ZuulTestCase):
self.waitUntilSettled()
old = self.sched.tenant_last_reconfigured.get('tenant-one', 0)
time.sleep(1)
zuul_yaml = [
{'job': {

1
tests/unit/test_scheduler.py
View File

@ -3214,7 +3214,6 @@ class TestScheduler(ZuulTestCase):
# record previous tenant reconfiguration time, which may not be set
old = self.sched.tenant_last_reconfigured.get('tenant-one', 0)
time.sleep(1)
self.waitUntilSettled()
command_socket = self.config.get('scheduler', 'command_socket')

2
zuul/scheduler.py
View File

@ -991,7 +991,7 @@ class Scheduler(threading.Thread):
trigger.postConfig(pipeline)
for reporter in pipeline.actions:
reporter.postConfig()
self.tenant_last_reconfigured[tenant.name] = int(time.time())
self.tenant_last_reconfigured[tenant.name] = time.time()
if self.statsd:
try:
for pipeline in tenant.layout.pipelines.values():