Ensure empty results are returned

Code Issues Proposed changes

Make sure that empty but still valid results (like no unmounted drives)
aren't treated as 500 errors.
Change-Id: I9588e2711d7916406f15613d5a26b9f0cf38235a

This commit is contained in:

Florian Hines

2012年05月31日 18:25:05 -05:00

parent ff761638ca

commit 243b439507

2 changed files with 28 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/middleware/recon.py

View File

@@ -310,7 +310,7 @@ class ReconMiddleware(object):

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:

27
test/unit/common/middleware/test_recon.py

View File

@@ -145,6 +145,9 @@ class FakeRecon(object):

def fake_unmounted(self):

return {'unmountedtest': "1"}

def fake_no_unmounted(self):

return []

def fake_diskusage(self):

return {'diskusagetest': "1"}

@@ -547,6 +550,21 @@ class TestReconSuccess(TestCase):

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 @@ class TestReconMiddleware(unittest.TestCase):

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"}']