Skip to content
This repository has been archived by the owner on Dec 7, 2022. It is now read-only.
/ pulp Public archive

Commit

Permalink
Remove the webpy controllers for users and tasks.
Browse files Browse the repository at this point in the history
  • Loading branch information
Randy Barlow authored and asmacdo committed Apr 10, 2015
1 parent 168d73d commit a84c357
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 408 deletions.
5 changes: 2 additions & 3 deletions server/pulp/server/webservices/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def process(processors):
from pulp.server.debugging import StacktraceDumper
from pulp.server.db.migrate import models as migration_models
from pulp.server.webservices.controllers import (
consumer_groups, consumers, contents, dispatch, repo_groups, repositories, users)
consumer_groups, consumers, contents, repo_groups, repositories, status)
from pulp.server.webservices.middleware.exception import ExceptionHandlerMiddleware
from pulp.server.webservices.middleware.postponed import PostponedOperationMiddleware
from pulp.server.webservices.middleware.framework_router import FrameworkRoutingMiddleware
Expand All @@ -50,8 +50,7 @@ def process(processors):
'/v2/content', contents.application,
'/v2/repo_groups', repo_groups.application,
'/v2/repositories', repositories.application,
'/v2/tasks', dispatch.task_application,
'/v2/users', users.application,
'/v2/status', status.application,
)

logger = logging.getLogger(__name__)
Expand Down
66 changes: 0 additions & 66 deletions server/pulp/server/webservices/controllers/dispatch.py

This file was deleted.

67 changes: 0 additions & 67 deletions server/pulp/server/webservices/controllers/users.py

This file was deleted.

48 changes: 0 additions & 48 deletions server/test/unit/server/webservices/controllers/test_dispatch.py

This file was deleted.

12 changes: 6 additions & 6 deletions server/test/unit/server/webservices/views/test_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ def test_get_users(self, mock_factory, mock_resp):
"""
Test users retrieval.
"""
mock_factory.user_query_manager.\
return_value.find_all.return_value = [{'login': 'test-user',
'name': 'test-user',
'id': '12345'}]
existing_users = [{'login': 'test-user', 'name': 'test-user', 'id': '12345'}]
mock_factory.user_query_manager.return_value.find_all.return_value = existing_users

request = mock.MagicMock()
response = UsersView().get(request)
view = UsersView()
response = view.get(request)

expected_cont = [{'_href': '/v2/users/test-user/', 'login': 'test-user',
'name': 'test-user'}]
'name': 'test-user'}]
mock_resp.assert_called_once_with(expected_cont)
self.assertTrue(response is mock_resp.return_value)

Expand Down
Loading

0 comments on commit a84c357

Please sign in to comment.