From 0362d081216f01a2bbfa36171a6d5ab712a7e281 Mon Sep 17 00:00:00 2001 From: John Spray Date: Sat, 15 Apr 2017 11:29:33 +0100 Subject: [PATCH] qa/suites/fs: put simple functional tests together Most of what's in basic/ is "workload" type testing (i.e. a simple cluster cluster configuration and then running a script inside the client), which gets permuted in various ways. Move the simpler functional tests out with the others like themselves. Signed-off-by: John Spray --- qa/suites/fs/recovery/overrides/fuse-unmounted.yaml | 3 --- qa/suites/fs/{basic => recovery}/tasks/asok_dump_tree.yaml | 0 qa/suites/fs/{basic => recovery}/tasks/cephfs_scrub_tests.yaml | 0 .../fs/{basic => recovery}/tasks/cfuse_workunit_quota.yaml | 0 qa/suites/fs/{basic => recovery}/tasks/libcephfs_java.yaml | 0 qa/suites/fs/{basic => recovery}/tasks/libcephfs_python.yaml | 0 qa/suites/fs/{basic => recovery}/tasks/mds_creation_retry.yaml | 0 7 files changed, 3 deletions(-) delete mode 100644 qa/suites/fs/recovery/overrides/fuse-unmounted.yaml rename qa/suites/fs/{basic => recovery}/tasks/asok_dump_tree.yaml (100%) rename qa/suites/fs/{basic => recovery}/tasks/cephfs_scrub_tests.yaml (100%) rename qa/suites/fs/{basic => recovery}/tasks/cfuse_workunit_quota.yaml (100%) rename qa/suites/fs/{basic => recovery}/tasks/libcephfs_java.yaml (100%) rename qa/suites/fs/{basic => recovery}/tasks/libcephfs_python.yaml (100%) rename qa/suites/fs/{basic => recovery}/tasks/mds_creation_retry.yaml (100%) diff --git a/qa/suites/fs/recovery/overrides/fuse-unmounted.yaml b/qa/suites/fs/recovery/overrides/fuse-unmounted.yaml deleted file mode 100644 index 02c8cf4d006..00000000000 --- a/qa/suites/fs/recovery/overrides/fuse-unmounted.yaml +++ /dev/null @@ -1,3 +0,0 @@ -overrides: - ceph-fuse: - disabled: true diff --git a/qa/suites/fs/basic/tasks/asok_dump_tree.yaml b/qa/suites/fs/recovery/tasks/asok_dump_tree.yaml similarity index 100% rename from qa/suites/fs/basic/tasks/asok_dump_tree.yaml rename to qa/suites/fs/recovery/tasks/asok_dump_tree.yaml diff --git a/qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml b/qa/suites/fs/recovery/tasks/cephfs_scrub_tests.yaml similarity index 100% rename from qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml rename to qa/suites/fs/recovery/tasks/cephfs_scrub_tests.yaml diff --git a/qa/suites/fs/basic/tasks/cfuse_workunit_quota.yaml b/qa/suites/fs/recovery/tasks/cfuse_workunit_quota.yaml similarity index 100% rename from qa/suites/fs/basic/tasks/cfuse_workunit_quota.yaml rename to qa/suites/fs/recovery/tasks/cfuse_workunit_quota.yaml diff --git a/qa/suites/fs/basic/tasks/libcephfs_java.yaml b/qa/suites/fs/recovery/tasks/libcephfs_java.yaml similarity index 100% rename from qa/suites/fs/basic/tasks/libcephfs_java.yaml rename to qa/suites/fs/recovery/tasks/libcephfs_java.yaml diff --git a/qa/suites/fs/basic/tasks/libcephfs_python.yaml b/qa/suites/fs/recovery/tasks/libcephfs_python.yaml similarity index 100% rename from qa/suites/fs/basic/tasks/libcephfs_python.yaml rename to qa/suites/fs/recovery/tasks/libcephfs_python.yaml diff --git a/qa/suites/fs/basic/tasks/mds_creation_retry.yaml b/qa/suites/fs/recovery/tasks/mds_creation_retry.yaml similarity index 100% rename from qa/suites/fs/basic/tasks/mds_creation_retry.yaml rename to qa/suites/fs/recovery/tasks/mds_creation_retry.yaml -- 2.39.5