Linter fixes.
This commit is contained in:
parent
f6fe9023a4
commit
5935e93eb8
4 changed files with 36 additions and 36 deletions
|
@ -430,9 +430,8 @@ class BuildComponent(BaseComponent):
|
|||
raise Return()
|
||||
|
||||
# If there is an active build, write the heartbeat to its status.
|
||||
build_status = self._build_status
|
||||
if build_status is not None:
|
||||
with build_status as status_dict:
|
||||
if self._build_status is not None:
|
||||
with self._build_status as status_dict:
|
||||
status_dict['heartbeat'] = int(time.time())
|
||||
|
||||
# Mark the build item.
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
from data.database import BUILD_PHASE
|
||||
from data import model
|
||||
from redis import RedisError
|
||||
|
||||
import datetime
|
||||
import logging
|
||||
|
||||
from data.database import BUILD_PHASE
|
||||
from data import model
|
||||
from buildman.asyncutil import AsyncWrapper
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class StatusHandler(object):
|
||||
""" Context wrapper for writing status to build logs. """
|
||||
|
||||
|
@ -17,10 +19,10 @@ class StatusHandler(object):
|
|||
self._build_logs = build_logs
|
||||
|
||||
self._status = {
|
||||
'total_commands': 0,
|
||||
'current_command': None,
|
||||
'push_completion': 0.0,
|
||||
'pull_completion': 0.0,
|
||||
'total_commands': 0,
|
||||
'current_command': None,
|
||||
'push_completion': 0.0,
|
||||
'pull_completion': 0.0,
|
||||
}
|
||||
|
||||
# Write the initial status.
|
||||
|
|
|
@ -1,16 +1,15 @@
|
|||
import logging
|
||||
import trollius
|
||||
import json
|
||||
import trollius
|
||||
|
||||
from threading import Event
|
||||
from datetime import timedelta
|
||||
from trollius.coroutines import From
|
||||
from autobahn.asyncio.wamp import RouterFactory, RouterSessionFactory
|
||||
from autobahn.asyncio.websocket import WampWebSocketServerFactory
|
||||
from autobahn.wamp import types
|
||||
|
||||
from aiowsgi import create_server as create_wsgi_server
|
||||
from flask import Flask
|
||||
from threading import Event
|
||||
from trollius.coroutines import From
|
||||
from datetime import timedelta
|
||||
|
||||
from buildman.enums import BuildJobResult, BuildServerStatus, RESULT_PHASES
|
||||
from buildman.jobutil.buildstatus import StatusHandler
|
||||
|
@ -46,12 +45,12 @@ class BuilderServer(object):
|
|||
self._build_logs = build_logs
|
||||
self._user_files = user_files
|
||||
self._lifecycle_manager = lifecycle_manager_klass(
|
||||
self._register_component,
|
||||
self._unregister_component,
|
||||
self._job_heartbeat,
|
||||
self._job_complete,
|
||||
manager_hostname,
|
||||
HEARTBEAT_PERIOD_SEC,
|
||||
self._register_component,
|
||||
self._unregister_component,
|
||||
self._job_heartbeat,
|
||||
self._job_complete,
|
||||
manager_hostname,
|
||||
HEARTBEAT_PERIOD_SEC,
|
||||
)
|
||||
self._lifecycle_manager_config = lifecycle_manager_config
|
||||
|
||||
|
|
|
@ -137,13 +137,13 @@ class TestEphemeralLifecycle(EphemeralBuilderTestCase):
|
|||
self.job_complete_callback = Mock()
|
||||
|
||||
self.manager = EphemeralBuilderManager(
|
||||
self.register_component_callback,
|
||||
self.unregister_component_callback,
|
||||
self.job_heartbeat_callback,
|
||||
self.job_complete_callback,
|
||||
'127.0.0.1',
|
||||
30,
|
||||
etcd_creator=self._create_mock_etcd_client,
|
||||
self.register_component_callback,
|
||||
self.unregister_component_callback,
|
||||
self.job_heartbeat_callback,
|
||||
self.job_complete_callback,
|
||||
'127.0.0.1',
|
||||
30,
|
||||
etcd_creator=self._create_mock_etcd_client,
|
||||
)
|
||||
|
||||
self.manager.initialize({'EXECUTOR': 'test'})
|
||||
|
@ -476,13 +476,13 @@ class TestEphemeral(EphemeralBuilderTestCase):
|
|||
job_complete_callback = Mock()
|
||||
|
||||
self.manager = EphemeralBuilderManager(
|
||||
self._register_component,
|
||||
unregister_component_callback,
|
||||
job_heartbeat_callback,
|
||||
job_complete_callback,
|
||||
'127.0.0.1',
|
||||
30,
|
||||
etcd_creator=self._create_mock_etcd_client,
|
||||
self._register_component,
|
||||
unregister_component_callback,
|
||||
job_heartbeat_callback,
|
||||
job_complete_callback,
|
||||
'127.0.0.1',
|
||||
30,
|
||||
etcd_creator=self._create_mock_etcd_client,
|
||||
)
|
||||
|
||||
def tearDown(self):
|
||||
|
|
Reference in a new issue