ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ut/bdev/raid: Use string constants for verification

Browse Source 
Some places had used dynamically allocated strings but they were
just duplicated from string constants. Hence we change them to
use string constants to make refactoring easier.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I0a5c4c1a72ee4aede12703c2dd50057c47098e28
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/464475
Reviewed-by: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-08-08 08:37:34 +09:00 committed by Changpeng Liu
parent cd6630d009
commit 6e90531549
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
test/unit/lib/bdev/bdev_raid.c/bdev_raid_ut.c
View File

@ -1115,8 +1115,8 @@ test_construct_raid(void)
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1148,8 +1148,8 @@ test_destroy_raid(void)
g_rpc_req = &construct_req; g_rpc_req = &construct_req;
g_rpc_req_size = sizeof(construct_req); g_rpc_req_size = sizeof(construct_req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(construct_req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(construct_req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1186,8 +1186,8 @@ test_construct_raid_invalid_args(void)
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
create_test_req(&req, "raid1", 0, true); create_test_req(&req, "raid1", 0, true);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
req.raid_level = 1; req.raid_level = 1;
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
@ -1198,8 +1198,8 @@ test_construct_raid_invalid_args(void)
verify_raid_bdev_present("raid1", false); verify_raid_bdev_present("raid1", false);
create_test_req(&req, "raid1", 0, false); create_test_req(&req, "raid1", 0, false);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_err = 1; g_json_decode_obj_err = 1;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
@ -1310,8 +1310,8 @@ test_destroy_raid_invalid_args(void)
g_rpc_req = &construct_req; g_rpc_req = &construct_req;
g_rpc_req_size = sizeof(construct_req); g_rpc_req_size = sizeof(construct_req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(construct_req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(construct_req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1370,8 +1370,8 @@ test_io_channel(void)
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1380,7 +1380,7 @@ test_io_channel(void)
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) {
if (strcmp(pbdev->bdev.name, req.name) == 0) { if (strcmp(pbdev->bdev.name, "raid1") == 0) {
break; break;
} }
} }
@ -1430,8 +1430,8 @@ test_write_io(void)
g_rpc_req = &req; g_rpc_req = &req;
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1439,7 +1439,7 @@ test_write_io(void)
verify_raid_config(&req, true); verify_raid_config(&req, true);
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) {
if (strcmp(pbdev->bdev.name, req.name) == 0) { if (strcmp(pbdev->bdev.name, "raid1") == 0) {
break; break;
} }
} }
@ -1506,8 +1506,8 @@ test_read_io(void)
g_rpc_req = &req; g_rpc_req = &req;
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1515,7 +1515,7 @@ test_read_io(void)
verify_raid_config(&req, true); verify_raid_config(&req, true);
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) {
if (strcmp(pbdev->bdev.name, req.name) == 0) { if (strcmp(pbdev->bdev.name, "raid1") == 0) {
break; break;
} }
} }
@ -1658,8 +1658,8 @@ test_unmap_io(void)
g_rpc_req = &req; g_rpc_req = &req;
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1667,7 +1667,7 @@ test_unmap_io(void)
verify_raid_config(&req, true); verify_raid_config(&req, true);
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) {
if (strcmp(pbdev->bdev.name, req.name) == 0) { if (strcmp(pbdev->bdev.name, "raid1") == 0) {
break; break;
} }
} }
@ -1739,8 +1739,8 @@ test_io_failure(void)
g_rpc_req = &req; g_rpc_req = &req;
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1831,8 +1831,8 @@ test_reset_io(void)
g_rpc_req = &req; g_rpc_req = &req;
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1840,7 +1840,7 @@ test_reset_io(void)
verify_raid_config(&req, true); verify_raid_config(&req, true);
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) {
if (strcmp(pbdev->bdev.name, req.name) == 0) { if (strcmp(pbdev->bdev.name, "raid1") == 0) {
break; break;
} }
} }
@ -1910,8 +1910,8 @@ test_io_waitq(void)
g_rpc_req = &req; g_rpc_req = &req;
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -1919,7 +1919,7 @@ test_io_waitq(void)
verify_raid_config(&req, true); verify_raid_config(&req, true);
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) {
if (strcmp(pbdev->bdev.name, req.name) == 0) { if (strcmp(pbdev->bdev.name, "raid1") == 0) {
break; break;
} }
} }
@ -2365,8 +2365,8 @@ test_raid_json_dump_info(void)
g_rpc_req_size = sizeof(req); g_rpc_req_size = sizeof(req);
CU_ASSERT(raid_bdev_init() == 0); CU_ASSERT(raid_bdev_init() == 0);
verify_raid_config_present(req.name, false); verify_raid_config_present("raid1", false);
verify_raid_bdev_present(req.name, false); verify_raid_bdev_present("raid1", false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_decode_obj_construct = 1; g_json_decode_obj_construct = 1;
spdk_rpc_construct_raid_bdev(NULL, NULL); spdk_rpc_construct_raid_bdev(NULL, NULL);
@ -2374,7 +2374,7 @@ test_raid_json_dump_info(void)
verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE); verify_raid_bdev(&req, true, RAID_BDEV_STATE_ONLINE);
TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) { TAILQ_FOREACH(pbdev, &g_raid_bdev_list, global_link) {
if (strcmp(pbdev->bdev.name, req.name) == 0) { if (strcmp(pbdev->bdev.name, "raid1") == 0) {
break; break;
} }
} }