Attachment 942335 Details for Bug 1147082 – revert the injection of the queue attribute

[patch] revert the injection of the queue attribute

remove_queue_attribute_and_test.patch (text/plain), 2.20 KB, created by Brian Bouterse on 2014-09-29 14:15:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Bouterse

Created: 2014-09-29 14:15:23 UTC

Size: 2.20 KB

patch

obsolete

>diff --git a/server/pulp/server/webservices/controllers/dispatch.py b/server/pulp/server/webservices/controllers/dispatch.py
>index 81e9ef6..86018aa 100644
>--- a/server/pulp/server/webservices/controllers/dispatch.py
>+++ b/server/pulp/server/webservices/controllers/dispatch.py
>@@ -1,5 +1,3 @@
>-from datetime import datetime
>-
> import web
> 
> from pulp.server.async import tasks
>@@ -7,7 +5,6 @@ from pulp.server.async.task_status_manager import TaskStatusManager
> from pulp.server.auth.authorization import READ
> from pulp.server.auth import authorization
> from pulp.server.db.model.criteria import Criteria
>-from pulp.server.db.model.resources import Worker
> from pulp.server.exceptions import MissingResource
> from pulp.server.webservices import serialization
> from pulp.server.webservices.controllers.base import JSONController
>@@ -96,9 +93,6 @@ class TaskResource(JSONController):
>             link = serialization.link.link_obj('/pulp/api/v2/tasks/%s/' % task_id)
>             task.update(link)
>             task.update(serialization.dispatch.spawned_tasks(task))
>-            if 'worker_name' in task:
>-                queue_name = Worker(task['worker_name'], datetime.now()).queue_name
>-                task.update({'queue': queue_name})
>             return self.ok(task)
> 
>     @auth_required(authorization.DELETE)
>diff --git a/server/test/unit/server/webservices/controllers/test_dispatch.py b/server/test/unit/server/webservices/controllers/test_dispatch.py
>index 7ee7398..57d124a 100644
>--- a/server/test/unit/server/webservices/controllers/test_dispatch.py
>+++ b/server/test/unit/server/webservices/controllers/test_dispatch.py
>@@ -83,16 +83,6 @@ class TestTaskResource(PulpWebservicesTests):
>         self.assertEqual(revoke.call_count, 1)
>         revoke.assert_called_once_with(task_id, terminate=True)
> 
>-    def test_GET_has_correct_queue_attribute(self):
>-        task_id = '1234abcd'
>-        TaskStatusManager.create_task_status(task_id, worker_name='worker1')
>-
>-        result = self.task_resource.GET(task_id)
>-
>-        result_json = json.loads(result)
>-        self.assertTrue('queue' in result_json)
>-        self.assertTrue(result_json['queue'] == 'worker1.dq')
>-
> 
> class TestTaskCollection(base.PulpWebserviceTests):
>     """

Actions: View | Diff

Attachments on bug 1147082: 941718 | 942335