diff --git a/test/intergration_test/test_framework/app/ums/ums_app.py b/test/intergration_test/test_framework/app/ums/ums_app.py index e2a8bc647beae1f5ceb624d12204187dcb8e492a..da93540469b01765fb8aa7c5b94fb0e61b3dd011 100644 --- a/test/intergration_test/test_framework/app/ums/ums_app.py +++ b/test/intergration_test/test_framework/app/ums/ums_app.py @@ -21,8 +21,9 @@ def prepare_test_case(host_list, case_path, case_name="test_case"): case_out = os.path.join(case_path, "case_name") _cmd = f'cd {local_path};' \ - f'gcc ums_atom.cpp {case_cpp} ../common/test_log.c ../common/common.c {public_cpp} -g '\ - f'-rdynamic -lstdc++ -w -O0 -fPIC -fpermissive -o {case_path}/test_case' + f'gcc ums_atom.cpp ../common/common.c ../common/test_log.c ../common/test_thread_pool.c ' \ + f'{case_cpp} {public_cpp} -g -O0 ' \ + f'-rdynamic -lstdc++ -w -fPIC -fpermissive -o {case_path}/test_case' lib_list = ['-lsecurec', '-lglib-2.0', '-lpthread', f'-I {local_path}', '-I /usr/include/umdk/', \ '-ldl', '-I /usr/include/ub/umdk/ums/'] _cmd += " ".join(lib_list) @@ -61,7 +62,7 @@ def gen_random_port(host_list, port_num=2): def exec_test_case(host_list, path, server_num=1, client_num=1, **kwargs): log.info(f'---------- [Test path = {path} ] ----------') _test_port = gen_random_port(host_list) - check = kwargs.get("check", True) + check = kwargs.get("check", False) app_num = server_num + client_num case_path = kwargs.get("case_path", "''") timeout = kwargs.get("timeout", 1800) diff --git a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test.py b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test.py index 415de6a9ca9cdef0ebdd631a3ad1176d16b497b6..6fd7cee6bfa56b9d99b1d13c3861be26f876d6d4 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_read_proc_net_ums_addr(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test_ums_read_proc_net_ums_addr.cpp b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test_case.cpp similarity index 97% rename from test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test_ums_read_proc_net_ums_addr.cpp rename to test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test_case.cpp index 1d11898487f67d843fbc709eb9a12fa44d6ea03a..f2521cf6abb1183f6e7b8bf91f8ba78968cf05ee 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test_ums_read_proc_net_ums_addr.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_addr/test_case.cpp @@ -44,7 +44,7 @@ static int run_test(test_ums_ctx_t *ctx) } CHKERR_JUMP(ret != TEST_SUCCESS, "fallback connection error", EXIT); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------3"); return rc; @@ -54,5 +54,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } \ No newline at end of file diff --git a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test.py b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test.py index a1c3e8a2788a55e9a9e8c62992113ff3424e0684..6158d43eea8fd1334f48e64e94ea2aa13289c4bb 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_read_proc_net_ums_fbk(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test_ums_read_proc_net_ums_fbk.cpp b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test_case.cpp similarity index 97% rename from test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test_ums_read_proc_net_ums_fbk.cpp rename to test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test_case.cpp index 863b15626e1e43825a2e8e8ea2310135f9bb08a4..ebf04a15e24f1c8cd9f042d79b481b9cdc66e296 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test_ums_read_proc_net_ums_fbk.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_fbk/test_case.cpp @@ -43,7 +43,7 @@ static int run_test(test_ums_ctx_t *ctx) } CHKERR_JUMP(ret != TEST_SUCCESS, "fallback connection error", EXIT); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------3"); return rc; @@ -53,5 +53,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } \ No newline at end of file diff --git a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test.py b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test.py index 7b8014b85d89ef8742b9530a8aa08d1d1b894449..50d253c6044529c523ee6bbbe29a21d44384ef04 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_read_proc_net_ums_para_num(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test_ums_read_proc_net_ums_para_num.cpp b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test_case.cpp similarity index 95% rename from test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test_ums_read_proc_net_ums_para_num.cpp rename to test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test_case.cpp index 906f01abdd11c5948967eb2e46939d22f25846d9..a9aada9a03f7314f2debc695aed3dffe14f6ac0d 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test_ums_read_proc_net_ums_para_num.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_read_proc_net_ums_para_num/test_case.cpp @@ -24,7 +24,7 @@ static int run_test(test_ums_ctx_t *ctx) ret = -1; } CHKERR_JUMP(ret != TEST_SUCCESS, "para num name error", EXIT); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------1"); return rc; @@ -34,5 +34,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } \ No newline at end of file diff --git a/test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test.py b/test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test.py index 4aab404872763bc0642361ddb2a203935cbae838..9105d2c179cec2ff96a2cdb1e49c79f08b07d909 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_read_proc_sys_net_ums_output(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test_ums_read_proc_sys_net_ums_output.cpp b/test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test_case.cpp similarity index 96% rename from test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test_ums_read_proc_sys_net_ums_output.cpp rename to test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test_case.cpp index ac97224176e47053ff0ea2113833b44288737464..d2012bc374c4fe1f49405e409a736c37f56d33b8 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test_ums_read_proc_sys_net_ums_output.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_read_proc_sys_net_ums_output/test_case.cpp @@ -42,7 +42,7 @@ static int run_test(test_ums_ctx_t *ctx) ret = -1; } CHKERR_JUMP(ret != TEST_SUCCESS, "snd_buf error", EXIT); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------1"); return rc; @@ -52,5 +52,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } \ No newline at end of file diff --git a/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test.py b/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test.py index bde880bb1f8d755e13f73e6bfce7fe8213bd6058..aa3ba646d5e093053756f59ebb4cc8e4f7f34922 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_smoke_fallback_multiple(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test_ums_smoke_fallback_multiple.cpp b/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test_case.cpp similarity index 96% rename from test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test_ums_smoke_fallback_multiple.cpp rename to test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test_case.cpp index ea3b474273f7ac7f3acfe9bcc3f1efb05798462f..464d17f220db28d2d76ede5321c31f62ece37499 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test_ums_smoke_fallback_multiple.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_multiple/test_case.cpp @@ -38,7 +38,7 @@ int run_test(test_ums_ctx_t *ctx) CHKERR_JUMP(ret != TEST_SUCCESS, "fallback multiple connect failed", EXIT); exec_cmd(close_qperf, MAX_EXEC_CMD_RET_LEN, "pkill -9 qperf"); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------3"); return rc; @@ -48,5 +48,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } \ No newline at end of file diff --git a/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test.py b/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test.py index 8d6c2a865f544263f64908140eebcf3745115cd5..97fe697d71c056f619d3102eeca924f2dd359b6a 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_smoke_fallback_single(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test_ums_smoke_fallback_single.cpp b/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test_case.cpp similarity index 96% rename from test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test_ums_smoke_fallback_single.cpp rename to test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test_case.cpp index 545f5f0effef0bf92384ff69fea9bb3913730d27..2cd3fd3922a7bede942b9d5fd799ad8531fa6b3e 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test_ums_smoke_fallback_single.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_smoke_fallback_single/test_case.cpp @@ -39,7 +39,7 @@ static int run_test(test_ums_ctx_t *ctx) CHKERR_JUMP(ret != TEST_SUCCESS, "fallback single connect failed", EXIT); exec_cmd(close_qperf, MAX_EXEC_CMD_RET_LEN, "pkill -9 qperf"); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------3"); return rc; @@ -49,5 +49,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } \ No newline at end of file diff --git a/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test.py b/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test.py index 8281c3dde7dba8436a2382191af65528badb26ef..f643404e0d61915c4f08ff12b0bdac9d609d2903 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_smoke_ums_multiple(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test_ums_smoke_ums_multiple.cpp b/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test_case.cpp similarity index 97% rename from test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test_ums_smoke_ums_multiple.cpp rename to test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test_case.cpp index bcb06532a03444ad9ef957883eae749bda787710..b92df9d4cece66c4aff9c0bb70a95d5a10488cdd 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test_ums_smoke_ums_multiple.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_multiple/test_case.cpp @@ -37,7 +37,7 @@ static int run_test(test_ums_ctx_t *ctx) CHKERR_JUMP(ret != TEST_SUCCESS, "ums multiple connect failed", EXIT); exec_cmd(close_qperf, MAX_EXEC_CMD_RET_LEN, "pkill -9 qperf"); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------3"); return rc; @@ -47,5 +47,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } diff --git a/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test.py b/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test.py index 6419051d6fb1b253fb3f77b40a6fd8cb1ebc20d8..f5f6e2a23e5219463c1ff1a9d5a953c5fdc7be3d 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_smoke_ums_single(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test_ums_smoke_ums_single.cpp b/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test_case.cpp similarity index 96% rename from test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test_ums_smoke_ums_single.cpp rename to test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test_case.cpp index e84dd106a864e1b8b33bdac7524319f8a434c406..bbfaef606eecb1ad14839395d89a6846875ec745 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test_ums_smoke_ums_single.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_smoke_ums_single/test_case.cpp @@ -39,7 +39,7 @@ int run_test(test_ums_ctx_t *ctx) CHKERR_JUMP(ret != TEST_SUCCESS, "ums single connect failed", EXIT); exec_cmd(close_qperf, MAX_EXEC_CMD_RET_LEN, "pkill -9 qperf"); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------3"); return rc; @@ -49,5 +49,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } diff --git a/test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test.py b/test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test.py index b68ce9310abec129a499bd5cc1d7b3fa22f51285..c262e5ad904ce628e8f85480061430ea6b2443c4 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test.py +++ b/test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test.py @@ -32,7 +32,4 @@ class Test(UBUSFeature): def test_ums_write_proc_sys_net_ums_refresh(self): log.info(f'--------- [ Test local_path = {local_path} ] ---------') - self.exec_test_case(self.host_list, local_path) - -if __name__ == '__main__': - Test.test1() \ No newline at end of file + exec_test_case(self.host_list, local_path) diff --git a/test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test_ums_write_proc_sys_net_ums_refresh.cpp b/test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test_case.cpp similarity index 97% rename from test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test_ums_write_proc_sys_net_ums_refresh.cpp rename to test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test_case.cpp index f8bc14801dcfffe450f6c397849ef5b8dccf31f2..54101b30037f83f2980835c65419a29f7ef11222 100644 --- a/test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test_ums_write_proc_sys_net_ums_refresh.cpp +++ b/test/intergration_test/test_suites/UMS/test_ums_write_proc_sys_net_ums_refresh/test_case.cpp @@ -45,7 +45,7 @@ static int run_test(test_ums_ctx_t *ctx) } exec_cmd(close_qperf, MAX_EXEC_CMD_RET_LEN, "pkill -9 qperf"); - rc = UMS_SUCCESS; + rc = TEST_SUCCESS; EXIT: sync_time("----------------------------3"); return rc; @@ -55,5 +55,6 @@ int main(int argc, char *argv[]) { int ret; test_ums_ctx_t *ctx = test_ums_ctx_init(argc, argv, 1); ret = run_test(ctx); + destroy_test_ctx(ctx); return ret; } \ No newline at end of file