From 15d0dac543b7bc861bda16a3b4e498eadf1dfbb0 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 5 Apr 2018 17:05:40 -0700 Subject: [PATCH] test/lvol: sort test cases numerically Make sure test case 10000 is always last, since it kills the target app and makes any tests run after it fail. This also de-duplicates the test execution code (now the "all" case just fills out tc_list). Change-Id: I88b629a1ef17afd4b95a4fd7d0cbf0321238b7a4 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/406677 Reviewed-by: Paul Luse Tested-by: SPDK Automated Test System Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- test/lvol/lvol_test.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/test/lvol/lvol_test.py b/test/lvol/lvol_test.py index 3d9b22f95..684430827 100755 --- a/test/lvol/lvol_test.py +++ b/test/lvol/lvol_test.py @@ -34,21 +34,15 @@ if __name__ == "__main__": tc = TestCases(rpc_py, total_size, block_size, cluster_size, base_dir_path, app_path) if "all" in tc_list: - for num_test in [i.split("test_case")[1] for i in dir(TestCases) if "test_case" in i]: - fail_count = 0 - exec("fail_count += tc.test_case{num_test}" - "()".format(num_test=num_test)) - check_fail_count(fail_count, num_test) - if fail_count: - tc_failed.append(num_test) - else: - for num_test in tc_list: - fail_count = 0 - exec("fail_count += tc.test_case{num_test}" - "()".format(num_test=num_test)) - check_fail_count(fail_count, num_test) - if fail_count: - tc_failed.append(num_test) + tc_list = sorted([i.split("test_case")[1] for i in dir(TestCases) if "test_case" in i], key=int) + + for num_test in tc_list: + fail_count = 0 + exec("fail_count += tc.test_case{num_test}" + "()".format(num_test=num_test)) + check_fail_count(fail_count, num_test) + if fail_count: + tc_failed.append(num_test) if not tc_failed: print("RESULT: All test cases - PASS")