Skip to content

Skip containers that are not found while checking container.items #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanoborini merged 5 commits into from
Jun 5, 2017
Merged

Skip containers that are not found while checking container.items #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
795ebef
Skip containers that are not found while checking container.items
stefanoborini May 31, 2017
9c1b91b
Added test for coverage
stefanoborini Jun 2, 2017
c6a237b
Removed comment and restarted build
stefanoborini Jun 2, 2017
12acf7a
Merge branch 'master' into skip-missing-containers
stefanoborini Jun 2, 2017
ec8f7fe
Merge branch 'master' into skip-missing-containers
stefanoborini Jun 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions remoteappmanager/webapi/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ def items(self, items_response, **kwargs):
user_name=self.current_user.name,
mapping_id=accounting.id)

if container is None:
continue

rest_container = Container(identifier=container.url_id)
rest_container.fill(container)
running_containers.append(rest_container)
Expand Down
33 changes: 25 additions & 8 deletions remoteappmanager/webapi/tests/test_container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ def get_app(self):
def test_items(self):
manager = self._app.container_manager
manager.image = mock_coro_factory(Image())
manager.find_containers = mock_coro_factory(
[
manager.find_containers = mock_coro_factory([
DockerContainer(user="johndoe",
mapping_id="whatever",
url_id="12345",
Expand All @@ -48,12 +47,30 @@ def test_items(self):
'total': 2,
'offset': 0,
'items': {
'12345': {
'image_name': 'image',
'name': 'container',
'mapping_id': 'whatever'
}
}})
'12345': {
'image_name': 'image',
'name': 'container',
'mapping_id': 'whatever'
}
}})

def test_items_with_none_container(self):
manager = self._app.container_manager
manager.image = mock_coro_factory(Image())
manager.find_container = mock_coro_factory(None)

code, data = self.get("/user/johndoe/api/v1/containers/",
httpstatus.OK)

self.assertEqual(
data,
{
'identifiers': [],
'total': 0,
'offset': 0,
'items': {}
}
)

def test_create(self):
with patch("remoteappmanager"
Expand Down