Merge pull request #394 from CSCfi/bugfix/last-bucket-refresh

Return empty list of buckets, fixes #356

swift_browser_ui/ui/api.py

@@ -67,11 +67,6 @@ async def swift_list_buckets(request: aiohttp.web.Request) -> aiohttp.web.Respon
         # response at once
         serv = request.app["Sessions"][session]["ST_conn"].list()
         [_unpack(i, cont, request) for i in serv]
-        # for a bucket with no objects
-        if not cont:
-            # return empty object
-            request.app["Log"].debug("Empty container list.")
-            raise aiohttp.web.HTTPNotFound()
         return aiohttp.web.json_response(cont)
     except SwiftError:
         request.app["Log"].error("SwiftError occured return empty container list.")

tests/ui_unit/test_api.py

@@ -107,10 +107,11 @@ async def test_list_objects_with_unicode_nulls(self):
         )
 
     async def test_list_without_containers(self):
-        """Test function list buckets on a project without object storage."""
+        """Test function list buckets on a project without containers."""
         self.request.app["Sessions"][self.cookie]["ST_conn"].init_with_data(containers=0)
-        with self.assertRaises(HTTPNotFound):
-            _ = await swift_list_buckets(self.request)
+        response = await swift_list_buckets(self.request)
+        objects = json.loads(response.text)
+        self.assertEqual(objects, [])
 
     async def test_list_with_invalid_container(self):
         """Test function list objects with an invalid container id."""