Merge branch 'master' into release-2.0.0

Author: stefanoborini

alembic.ini

@@ -29,7 +29,7 @@ script_location = alembic/
 # are written from script.py.mako
 # output_encoding = utf-8
 
-sqlalchemy.url = sqlite://jupyterhub/remoteappmanager.db
+sqlalchemy.url = sqlite:///jupyterhub/remoteappmanager.db
 
 
 # Logging configuration

remoteappmanager/webapi/container.py

@@ -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)

remoteappmanager/webapi/tests/test_container.py

@@ -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",
@@ -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"