qa: update rbd tests and runner

* no longer need to wait for watch timeout since #2948 was fixed
* use --format 2 instead of --new-format
* add test_cls_rbd to run-rbd-tests script

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Josh Durgin 2012-09-07 18:14:39 -07:00
parent 18427ecc0f
commit fd1c634b13
2 changed files with 3 additions and 5 deletions

View File

@ -153,10 +153,7 @@ test_ls
test_remove
RBD_CREATE_ARGS=""
test_others
# wait for watch to timeout so we can remove old images
# TODO: remove this once #2476 is fixed
sleep 30
RBD_CREATE_ARGS="--new-format"
RBD_CREATE_ARGS="--format 2"
test_others
echo OK

View File

@ -30,10 +30,11 @@ run_api_tests() {
test_librbd
}
test_cls_rbd
run_api_tests
run_cli_tests
RBD_CREATE_ARGS="--new-format"
RBD_CREATE_ARGS="--format 2"
run_cli_tests
for i in 0 1