From 7bd9e8c24b636f2697a6cacb79e722fde3fc4da1 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Fri, 9 Feb 2018 09:01:45 -0500 Subject: [PATCH] test/lvol: Assign big number to SIGTERM test case to avoid renumbering test cases in the future. SIGTERM should be called as last test case, because it kills vhost instance. If it is called in the middle another test case should start vhost again. Want to avoid this. Change-Id: Idd3e1492bd83e911d17e730c680187cd98f0c125 Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/399131 Tested-by: SPDK Automated Test System Reviewed-by: Karol Latecki Reviewed-by: Maciej Szwed Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- autotest.sh | 2 +- test/lvol/lvol.sh | 2 +- test/lvol/test_cases.py | 8 ++++---- test/lvol/test_plan.md | 42 ++++++++++++++++++++--------------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/autotest.sh b/autotest.sh index 8687c173c..5a91cd711 100755 --- a/autotest.sh +++ b/autotest.sh @@ -181,7 +181,7 @@ if [ $SPDK_TEST_LVOL -eq 1 ]; then timing_enter lvol test_cases="1,50,51,52,53,100,101,102,250,251,252,253,255," test_cases+="300,301,450,451,452,550,600,601,650,651,652,654,655," - test_cases+="700,701,750" + test_cases+="700,701,10000" run_test ./test/lvol/lvol.sh --test-cases=$test_cases timing_exit lvol fi diff --git a/test/lvol/lvol.sh b/test/lvol/lvol.sh index 7c03d25a3..bc4c7c2c8 100755 --- a/test/lvol/lvol.sh +++ b/test/lvol/lvol.sh @@ -58,7 +58,7 @@ function usage() { 655: 'thin_provisioning_filling_disks_less_than_lvs_size', 700: 'tasting_positive', 701: 'tasting_lvol_store_positive', - 750: 'SIGTERM' + 10000: 'SIGTERM' or all: This parameter runs all tests Ex: \"1,2,19,20\", default: all" diff --git a/test/lvol/test_cases.py b/test/lvol/test_cases.py index df1447148..e84096809 100644 --- a/test/lvol/test_cases.py +++ b/test/lvol/test_cases.py @@ -61,7 +61,7 @@ def header(num): 655: 'thin_provisioning_filling_disks_less_than_lvs_size', 700: 'tasting_positive', 701: 'tasting_lvol_store_positive', - 750: 'SIGTERM', + 10000: 'SIGTERM', } print("========================================================") print("Test Case {num}: Start".format(num=num)) @@ -1067,8 +1067,8 @@ class TestCases(object): footer(701) return fail_count - def test_case750(self): - header(750) + def test_case10000(self): + header(10000) pid_path = path.join(self.path, 'vhost.pid') base_name = self.c.construct_malloc_bdev(self.total_size, @@ -1080,5 +1080,5 @@ class TestCases(object): self.cluster_size) fail_count += self._stop_vhost(pid_path) - footer(750) + footer(10000) return fail_count diff --git a/test/lvol/test_plan.md b/test/lvol/test_plan.md index b5a112b4d..4b5c7183d 100644 --- a/test/lvol/test_plan.md +++ b/test/lvol/test_plan.md @@ -720,24 +720,9 @@ Expected result: - calls successful (lvol store should be tasted correctly), return code = 0 - no other operation fails -### SIGTERM - -#### TEST CASE 750 - Name: SIGTERM -Call CTRL+C (SIGTERM) occurs after creating lvol store -Steps: -- create a malloc bdev -- construct_lvol_store on created malloc bdev -- check correct uuid values in response get_lvol_stores command -- Send SIGTERM signal to the application - -Expected result: -- calls successful, return code = 0 -- get_bdevs: no change -- no other operation fails - ### snapshot and clone -#### TEST CASE 800 - Name: snapshot_readonly +#### TEST CASE 750 - Name: snapshot_readonly - constrcut malloc bdev - construct lvol store on malloc bdev - construct lvol bdev @@ -754,7 +739,7 @@ Expected result: - calls successful, return code = 0 - no other operation fails -#### TEST CASE 801 - Name: snapshot_compare_with_lvol_bdev +#### TEST CASE 751 - Name: snapshot_compare_with_lvol_bdev - construct malloc bdev - construct lvol store on malloc bdev - construct thin provisioned lvol bdev with size less than 25% of lvs @@ -776,7 +761,7 @@ Expected result: - removing snapshot should always end with success - no other operation fails -#### TEST CASE 802 - Name: snapshot_during_io_traffic +#### TEST CASE 752 - Name: snapshot_during_io_traffic - construct malloc bdev - construct lvol store on malloc bdev - construct thin provisioned lvol bdev @@ -792,7 +777,7 @@ Expected result: - calls successful, return code = 0 - no other operation fails -#### TEST CASE 803 - Name: snapshot_of_snapshot +#### TEST CASE 753 - Name: snapshot_of_snapshot - construct malloc bdev - construct lvol store on malloc bdev - construct thick provisioned lvol bdev @@ -808,7 +793,7 @@ Expected result: - creating snapshot of snapshot should fail - no other operation fails -#### TEST CASE 804 - Name: clone_bdev_only +#### TEST CASE 754 - Name: clone_bdev_only - construct malloc bdev - construct lvol store on malloc - construct thick provisioned lvol bdev @@ -831,7 +816,7 @@ Expected result: - cloning thick provisioned lvol bdev should fail - no other operation fails -#### TEST CASE 806 - Name: clone_writing_to_clone +#### TEST CASE 755 - Name: clone_writing_to_clone - construct with malloc bdev - construct lvol store on malloc bdev - construct thick provisioned lvol bdev @@ -850,3 +835,18 @@ Expected result: Expected result: - calls successful, return code = 0 - no other operation fails + +### SIGTERM + +#### TEST CASE 10000 - Name: SIGTERM +Call CTRL+C (SIGTERM) occurs after creating lvol store +Steps: +- create a malloc bdev +- construct_lvol_store on created malloc bdev +- check correct uuid values in response get_lvol_stores command +- Send SIGTERM signal to the application + +Expected result: +- calls successful, return code = 0 +- get_bdevs: no change +- no other operation fails