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

ut/raid: remove negative tests for spdk_jsonrpc_begin_result()

Browse Source 
spdk_jsonrpc_begin_result() will be refactored to always
return non-null in subsequent patch and those raid tests
will no longer make sense, so we remove them now.

Change-Id: Ifd4570af4daab9c96cd8701440366e292f879204
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459659
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Pawel Kaminski 2019-06-27 11:58:46 -04:00 committed by Darek Stojaczyk
parent ade7d070f2
commit c72e3bfe5b
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,6 @@ uint8_t g_ignore_io_output;
uint8_t g_rpc_err; uint8_t g_rpc_err;
char *g_get_raids_output[MAX_RAIDS]; char *g_get_raids_output[MAX_RAIDS];
uint32_t g_get_raids_count; uint32_t g_get_raids_count;
uint8_t g_json_beg_res_ret_err;
uint8_t g_json_decode_obj_err; uint8_t g_json_decode_obj_err;
uint8_t g_json_decode_obj_construct; uint8_t g_json_decode_obj_construct;
uint8_t g_config_level_create = 0; uint8_t g_config_level_create = 0;
@ -179,7 +178,6 @@ set_globals(void)
TAILQ_INIT(&g_io_waitq); TAILQ_INIT(&g_io_waitq);
rpc_req = NULL; rpc_req = NULL;
rpc_req_size = 0; rpc_req_size = 0;
g_json_beg_res_ret_err = 0;
g_json_decode_obj_err = 0; g_json_decode_obj_err = 0;
g_json_decode_obj_construct = 0; g_json_decode_obj_construct = 0;
g_lba_offset = 0; g_lba_offset = 0;
@ -561,12 +559,8 @@ spdk_json_decode_object(const struct spdk_json_val *values,
struct spdk_json_write_ctx * struct spdk_json_write_ctx *
spdk_jsonrpc_begin_result(struct spdk_jsonrpc_request *request) spdk_jsonrpc_begin_result(struct spdk_jsonrpc_request *request)
{ {
if (g_json_beg_res_ret_err) {
return NULL;
} else {
return (void *)1; return (void *)1;
} }
}
int int
spdk_json_write_string(struct spdk_json_write_ctx *w, const char *val) spdk_json_write_string(struct spdk_json_write_ctx *w, const char *val)
@ -1282,7 +1276,6 @@ test_construct_raid_invalid_args(void)
create_test_req(&req, "raid2", g_max_base_drives, false); create_test_req(&req, "raid2", g_max_base_drives, false);
g_rpc_err = 0; g_rpc_err = 0;
g_json_beg_res_ret_err = 1;
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);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
@ -1291,7 +1284,6 @@ test_construct_raid_invalid_args(void)
verify_raid_bdev_present("raid2", true); verify_raid_bdev_present("raid2", true);
verify_raid_config_present("raid1", true); verify_raid_config_present("raid1", true);
verify_raid_bdev_present("raid1", true); verify_raid_bdev_present("raid1", true);
g_json_beg_res_ret_err = 0;
destroy_req.name = strdup("raid1"); destroy_req.name = strdup("raid1");
rpc_req = &destroy_req; rpc_req = &destroy_req;
@ -2098,12 +2090,14 @@ test_multi_raid_no_io(void)
rpc_req = &get_raids_req; rpc_req = &get_raids_req;
rpc_req_size = sizeof(get_raids_req); rpc_req_size = sizeof(get_raids_req);
g_rpc_err = 0; g_rpc_err = 0;
g_json_beg_res_ret_err = 1;
g_json_decode_obj_construct = 0; g_json_decode_obj_construct = 0;
spdk_rpc_get_raid_bdevs(NULL, NULL); spdk_rpc_get_raid_bdevs(NULL, NULL);
CU_ASSERT(g_rpc_err == 0); CU_ASSERT(g_rpc_err == 0);
g_json_beg_res_ret_err = 0; CU_ASSERT(g_get_raids_count == g_max_raids);
CU_ASSERT(g_get_raids_count == 0); for (i = 0; i < g_get_raids_count; i++) {
free(g_get_raids_output[i]);
}
g_get_raids_count = 0;
for (i = 0; i < g_max_raids; i++) { for (i = 0; i < g_max_raids; i++) {
SPDK_CU_ASSERT_FATAL(construct_req[i].name != NULL); SPDK_CU_ASSERT_FATAL(construct_req[i].name != NULL);