Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
commit 1afb7bd9830d976bdc373d7ba7e86ab2f307f6ec Author: Valentin Gologuzov vgologuz@redhat.com Date: Fri Nov 28 12:47:25 2014 +0100
[backend] renamed FrontendCallback to FrontendClient
backend/backend/dispatcher.py | 14 +++++++------- backend/backend/{callback.py => frontend.py} | 4 ++-- backend/run/copr-be.py | 4 ++-- backend/tests/test_dispatcher.py | 2 -- 4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/backend/backend/dispatcher.py b/backend/backend/dispatcher.py index b17173a..13fcb5d 100644 --- a/backend/backend/dispatcher.py +++ b/backend/backend/dispatcher.py @@ -23,7 +23,7 @@ from .exceptions import MockRemoteError, CoprWorkerError, CoprWorkerSpawnFailErr from .job import BuildJob
from .mockremote import MockRemote -from .callback import FrontendCallback +from .frontend import FrontendClient from .constants import BuildStatus
ansible_playbook = "ansible-playbook" @@ -81,7 +81,7 @@ class Worker(multiprocessing.Process):
self.lock = lock self.spawn_in_advance = self.opts.spawn_in_advance - self.frontend_callback = FrontendCallback(opts, events) + self.frontend_callback = FrontendClient(opts, events)
self.callback = callback if not self.callback: @@ -573,8 +573,8 @@ class Worker(multiprocessing.Process): self.terminate_instance(vm_ip) vm_ip = None
- # TODO: since spawn requires job object to create vm - # it's possible to have spawned VM with incorrect configuration - # disabling spawn in advance for now - # if self.spawn_in_advance: - # vm_ip = self.spawn_instance_with_check(job) + # TODO: since spawn requires job object to create vm + # it's possible to have spawned VM with incorrect configuration + # disabling spawn in advance for now + # if self.spawn_in_advance: + # vm_ip = self.spawn_instance_with_check(job) diff --git a/backend/backend/callback.py b/backend/backend/frontend.py similarity index 96% rename from backend/backend/callback.py rename to backend/backend/frontend.py index f76f5fd..c34857a 100644 --- a/backend/backend/callback.py +++ b/backend/backend/frontend.py @@ -3,13 +3,13 @@ import requests import time
-class FrontendCallback(object): +class FrontendClient(object): """ Object to send data back to fronted """
def __init__(self, opts, events): - super(FrontendCallback, self).__init__() + super(FrontendClient, self).__init__() self.frontend_url = opts.frontend_url self.frontend_auth = opts.frontend_auth
diff --git a/backend/run/copr-be.py b/backend/run/copr-be.py index fe1a65c..bdca6e8 100755 --- a/backend/run/copr-be.py +++ b/backend/run/copr-be.py @@ -29,7 +29,7 @@ from retask import ConnectionError from backend.exceptions import CoprBackendError from backend.dispatcher import Worker from backend.actions import Action -from backend.callback import FrontendCallback +from backend.frontend import FrontendClient from backend.helpers import BackendConfigReader
@@ -120,7 +120,7 @@ class CoprJobGrab(multiprocessing.Process):
for action in r_json["actions"]: ao = Action(self.events, action, self.lock, destdir=self.opts.destdir, - frontend_callback=FrontendCallback(self.opts, self.events), + frontend_callback=FrontendClient(self.opts, self.events), front_url=self.opts.frontend_base_url, results_root_url=self.opts.results_baseurl) ao.run() diff --git a/backend/tests/test_dispatcher.py b/backend/tests/test_dispatcher.py index 77bbb6d..044500b 100644 --- a/backend/tests/test_dispatcher.py +++ b/backend/tests/test_dispatcher.py @@ -678,8 +678,6 @@ class TestDispatcher(object): assert self.worker.obtain_job.called assert self.worker.terminate_instance.called
- - @mock.patch("backend.dispatcher.time") def test_run_no_job(self, mc_time, init_worker): self.worker.init_fedmsg = MagicMock()