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>

diff --git a/qa/workunits/rbd/copy.sh b/qa/workunits/rbd/copy.sh
index 7660991b2d2dde9c43da5171da90c945c88da0f7..bd32f6eb1c47733561f9feca3ca3be21d2790c08 100755 (executable)
--- a/qa/workunits/rbd/copy.sh
+++ b/qa/workunits/rbd/copy.sh
@@ -198,10 +198,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

diff --git a/src/test/run-rbd-tests b/src/test/run-rbd-tests
index 6b82bede3b72150dfd713d86d75f0e56e75fa6e4..fe8fa4dd505c14691dd584961f1e7d0278cb6254 100755 (executable)
--- a/src/test/run-rbd-tests
+++ b/src/test/run-rbd-tests
@@ -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