Merge "Ensure empty results are returned" into milestone-proposed

Author: Jenkins

swift/common/middleware/recon.py

@@ -310,7 +310,7 @@ def GET(self, req):
             content = "Invalid path: %s" % req.path
             return Response(request=req, status="404 Not Found",
                             body=content, content_type="text/plain")
-        if content:
+        if content is not None:
             return Response(request=req, body=json.dumps(content),
                             content_type="application/json")
         else:

test/unit/common/middleware/test_recon.py

@@ -145,6 +145,9 @@ def fake_mounted(self):
     def fake_unmounted(self):
         return {'unmountedtest': "1"}
 
+    def fake_no_unmounted(self):
+        return []
+
     def fake_diskusage(self):
         return {'diskusagetest': "1"}
 
@@ -547,6 +550,21 @@ def fake_checkmount_true(*args):
         self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})])
         self.assertEquals(rv, unmounted_resp)
 
+    def test_no_get_unmounted(self):
+
+        def fake_checkmount_true(*args):
+            return True
+
+        unmounted_resp = []
+        self.mockos.ls_output=[]
+        self.mockos.path_exists_output=False
+        real_checkmount = swift.common.constraints.check_mount
+        swift.common.constraints.check_mount = fake_checkmount_true
+        rv = self.app.get_unmounted()
+        swift.common.constraints.check_mount = real_checkmount
+        self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})])
+        self.assertEquals(rv, unmounted_resp)
+
     def test_get_diskusage(self):
         #posix.statvfs_result(f_bsize=4096, f_frsize=4096, f_blocks=1963185,
         #                     f_bfree=1113075, f_bavail=1013351, f_files=498736,
@@ -778,10 +796,19 @@ def test_recon_get_mounted(self):
 
     def test_recon_get_unmounted(self):
         get_unmounted_resp = ['{"unmountedtest": "1"}']
+        self.app.get_unmounted = self.frecon.fake_unmounted
         req = Request.blank('/recon/unmounted',
                             environ={'REQUEST_METHOD': 'GET'})
         resp = self.app(req.environ, start_response)
         self.assertEquals(resp, get_unmounted_resp)
+    
+    def test_recon_no_get_unmounted(self):
+        get_unmounted_resp = '[]'
+        self.app.get_unmounted = self.frecon.fake_no_unmounted
+        req = Request.blank('/recon/unmounted',
+                            environ={'REQUEST_METHOD': 'GET'})
+        resp = ''.join(self.app(req.environ, start_response))
+        self.assertEquals(resp, get_unmounted_resp)
 
     def test_recon_get_diskusage(self):
         get_diskusage_resp = ['{"diskusagetest": "1"}']