summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lowell <gary.lowell@inktank.com>2013-07-22 23:23:34 -0700
committerGary Lowell <gary.lowell@inktank.com>2013-07-22 23:23:34 -0700
commit9e734ffeae66edfca285ec447c31b871d8464478 (patch)
tree00f4fa03fbab040de843364d7fcce0d3199cae5f
parentfc6cb81ebae3b4bc3634e8db04218c9d838db6eb (diff)
parent98816e696bdf219c127d4e43755f70e00abdc34f (diff)
downloadceph-9e734ffeae66edfca285ec447c31b871d8464478.tar.gz
Merge branch 'next'
-rwxr-xr-xqa/workunits/rest/test.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index 0c99891bad3..272760c8289 100755
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -141,11 +141,9 @@ if __name__ == '__main__':
# XXX no ceph -w equivalent yet
expect('mds/cluster_down', 'PUT', 200, '')
- # failure if down
- expect('mds/cluster_down', 'PUT', 400, '')
+ expect('mds/cluster_down', 'PUT', 200, '')
+ expect('mds/cluster_up', 'PUT', 200, '')
expect('mds/cluster_up', 'PUT', 200, '')
- # failure if up
- expect('mds/cluster_up', 'PUT', 400, '')
expect('mds/compat/rm_incompat?feature=4', 'PUT', 200, '')
expect('mds/compat/rm_incompat?feature=4', 'PUT', 200, '')