openstack/swift
Code Issues Proposed changes

Merge "fix probe tests to work in a VM using mount_check"

Browse Source
This commit is contained in:
Jenkins 2013-04-15 18:47:31 +00:00 committed by Gerrit Code Review
commit 9826c173da
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/probe/common.py
View File

@ -56,7 +56,9 @@ def check_server(port, port2server, pids, timeout=CHECK_SERVER_TIMEOUT):
conn = HTTPConnection('127.0.0.1', port)
conn.request('GET', path)
resp = conn.getresponse()
if resp.status != 404:
# 404 because it's a nonsense path (and mount_check is false)
# 507 in case the test target is a VM using mount_check
if resp.status not in (404, 507):
raise Exception(
'Unexpected status %s' % resp.status)
break