From 25911b255ce8e30c6adcd2c628f97c867b8496b0 Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Fri, 9 Feb 2018 12:01:54 +0300 Subject: [PATCH] LU-10639 tests: rename the tests The following tests are renamed to be run separately from other tests in the groups: sanity-hsm: test_1 to test_1A test_9 to test_9A test_26 to test_26A test_220 to test_220A test_224 to test_224A conf-sanity: test_28 to test_28A lustre-rsync-test.sh: test_1 to test_1A sanity.sh: test_239 to test_239A Signed-off-by: Elena Gryaznova Signed-off-by: Ajay Nair Cray-bug-id: LUS-2608, LUS-5328 Seagate-bug-id: MRP-4695, MRP-4121 Test-Parameters: testlist=sanity,sanity-hsm,conf-sanity Test-Parameters: testlist=lustre-rsync-test Reviewed-by: Ashish Purkar Reviewed-by: Andriy Skulysh Change-Id: Ib1542d55328c0fb60c0c2c59257fa9f5742a57dc Reviewed-on: https://review.whamcloud.com/31230 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Patrick Farrell Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 4 ++-- lustre/tests/lustre-rsync-test.sh | 4 ++-- lustre/tests/sanity-hsm.sh | 20 ++++++++++---------- lustre/tests/sanity.sh | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 7297ba7..93527e6 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -1082,7 +1082,7 @@ test_27b() { } run_test 27b "Reacquire MGS lock after failover" -test_28() { +test_28A() { # was test_28 setup TEST="$LCTL get_param -n llite.$FSNAME-*.max_read_ahead_whole_mb" PARAM="$FSNAME.llite.max_read_ahead_whole_mb" @@ -1105,7 +1105,7 @@ test_28() { error "third set_conf_param_and_check client failed" cleanup || error "cleanup failed with rc $?" } -run_test 28 "permanent parameter setting" +run_test 28A "permanent parameter setting" test_28a() { # LU-4221 [[ $(lustre_version_code ost1) -ge $(version_code 2.5.52) ]] || diff --git a/lustre/tests/lustre-rsync-test.sh b/lustre/tests/lustre-rsync-test.sh index a67447e3b..0fcfffb 100644 --- a/lustre/tests/lustre-rsync-test.sh +++ b/lustre/tests/lustre-rsync-test.sh @@ -161,7 +161,7 @@ stop_procs() { } # Test 1 - test basic operations -test_1() { +test_1A() { # was test_1 init_src init_changelog local xattr=$(check_xattr $TGT/foo) @@ -244,7 +244,7 @@ test_1() { cleanup_src_tgt return $RC } -run_test 1 "Simple Replication" +run_test 1A "Simple Replication" # Test 1a - test create/delete operations in ROOT directory test_1a() { # LU-5005 diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh index 5a206b0..e842d06 100755 --- a/lustre/tests/sanity-hsm.sh +++ b/lustre/tests/sanity-hsm.sh @@ -1012,7 +1012,7 @@ cdt_set_sanity_policy # finished requests are quickly removed from list set_hsm_param grace_delay 10 -test_1() { +test_1A() { # was test_1 mkdir -p $DIR/$tdir chmod 777 $DIR/$tdir @@ -1045,7 +1045,7 @@ test_1() { check_hsm_flags_user $f "0x00000000" } -run_test 1 "lfs hsm flags root/non-root access" +run_test 1A "lfs hsm flags root/non-root access" test_1a() { local f=$DIR/$tdir/$tfile @@ -1246,7 +1246,7 @@ test_8() { } run_test 8 "Test default archive number" -test_9() { +test_9A() { # was test_9 # we do not use the default one to be sure local archive_id=$((HSM_ARCHIVE_NUMBER + 1)) copytool setup --archive-id $archive_id @@ -1264,7 +1264,7 @@ test_9() { check_hsm_flags $f "0x00000009" } -run_test 9 "Use of explicit archive number, with dedicated copytool" +run_test 9A "Use of explicit archive number, with dedicated copytool" test_9a() { needclients 3 || return 0 @@ -2413,7 +2413,7 @@ test_25b() { run_test 25b "Restore lost file (HS_LOST flag) after release"\ " (Operation not permitted)" -test_26() { +test_26A() { # was test_26 # test needs a running copytool copytool setup @@ -2430,7 +2430,7 @@ test_26() { check_hsm_flags $f "0x00000000" } -run_test 26 "Remove the archive of a valid file" +run_test 26A "Remove the archive of a valid file" test_26a() { local raolu=$(get_hsm_param remove_archive_on_last_unlink) @@ -4178,7 +4178,7 @@ test_202() { } run_test 202 "Register/Cancel remove" -test_220() { +test_220A() { # was test_220 # test needs a running copytool copytool setup @@ -4198,7 +4198,7 @@ test_220() { local target=0x0 [[ $flags == $target ]] || error "Changelog flag is $flags not $target" } -run_test 220 "Changelog for archive" +run_test 220A "Changelog for archive" test_220a() { # test needs a running copytool @@ -4431,7 +4431,7 @@ test_223b() { } run_test 223b "Changelog for restore canceled (release case)" -test_224() { +test_224A() { # was test_224 # test needs a running copytool copytool setup @@ -4453,7 +4453,7 @@ test_224() { [[ $flags == $target ]] || error "Changelog flag is $flags not $target" } -run_test 224 "Changelog for remove" +run_test 224A "Changelog for remove" test_224a() { # test needs a running copytool diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index e685f76..5860efb 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -14936,7 +14936,7 @@ test_238() { } run_test 238 "Verify linkea consistency" -test_239() { +test_239A() { # was test_239 [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.5.60) ] && skip "Need MDS version at least 2.5.60" && return local list=$(comma_list $(mdts_nodes)) @@ -14950,7 +14950,7 @@ test_239() { osp.*MDT*.sync_in_flight" | calc_sum) [ "$changes" -eq 0 ] || error "$changes not synced" } -run_test 239 "osp_sync test" +run_test 239A "osp_sync test" test_239a() { #LU-5297 remote_mds_nodsh && skip "remote MDS with nodsh" && return -- 1.8.3.1