From 02d4c2b32a4738fd18fd42e32a9cc1a42a06b1e3 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Fri, 23 Oct 2020 06:00:50 -0400 Subject: [PATCH] ut/iscsi: remove unused legacy config files The tests did not use the legacy files anyway. Signed-off-by: Tomasz Zawadzki Change-Id: Icffedb7cc7a8574f0f801883b2d9655515cab687 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4855 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris --- test/unit/lib/iscsi/init_grp.c/init_grp.conf | 31 ------- test/unit/lib/iscsi/init_grp.c/init_grp_ut.c | 9 -- test/unit/lib/iscsi/tgt_node.c/tgt_node.conf | 95 -------------------- test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c | 9 -- test/unit/unittest.sh | 6 +- 5 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 test/unit/lib/iscsi/init_grp.c/init_grp.conf delete mode 100644 test/unit/lib/iscsi/tgt_node.c/tgt_node.conf diff --git a/test/unit/lib/iscsi/init_grp.c/init_grp.conf b/test/unit/lib/iscsi/init_grp.c/init_grp.conf deleted file mode 100644 index aaa660def..000000000 --- a/test/unit/lib/iscsi/init_grp.c/init_grp.conf +++ /dev/null @@ -1,31 +0,0 @@ -[IG_Valid0] -# Success is expected. - InitiatorName iqn.2017-10.spdk.io:0001 - Netmask 192.168.2.0 - -[IG_Valid1] -# Success is expected. - InitiatorName iqn.2017-10.spdk.io:0001 - Netmask 192.168.2.0 - Netmask 192.168.2.1 - -[IG_Valid2] -# Success is expected. - InitiatorName iqn.2017-10.spdk.io:0001 - InitiatorName iqn.2017-10.spdk.io:0002 - Netmask 192.168.2.0 - -[IG_Valid3] -# Success is expected. - InitiatorName iqn.2017-10.spdk.io:0001 - InitiatorName iqn.2017-10.spdk.io:0002 - Netmask 192.168.2.0 - Netmask 192.168.2.1 - -[IG_Invalid0] -# Failure is expected. - InitiatorName iqn.2017-10.spdk.io:0001 - -[IG_Invalid1] -# Failure is expected. - Netmask 192.168.2.0 diff --git a/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c b/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c index fb22af0fb..fe3de787e 100644 --- a/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c +++ b/test/unit/lib/iscsi/init_grp.c/init_grp_ut.c @@ -42,8 +42,6 @@ SPDK_LOG_REGISTER_COMPONENT(iscsi) struct spdk_iscsi_globals g_iscsi; -const char *config_file; - static int test_setup(void) { @@ -583,16 +581,9 @@ main(int argc, char **argv) CU_pSuite suite = NULL; unsigned int num_failures; - if (argc < 2) { - fprintf(stderr, "usage: %s \n", argv[0]); - exit(1); - } - CU_set_error_action(CUEA_ABORT); CU_initialize_registry(); - config_file = argv[1]; - suite = CU_add_suite("init_grp_suite", test_setup, NULL); CU_ADD_TEST(suite, create_initiator_group_success_case); diff --git a/test/unit/lib/iscsi/tgt_node.c/tgt_node.conf b/test/unit/lib/iscsi/tgt_node.c/tgt_node.conf deleted file mode 100644 index 6bf5aa664..000000000 --- a/test/unit/lib/iscsi/tgt_node.c/tgt_node.conf +++ /dev/null @@ -1,95 +0,0 @@ -[Global] - -# Test that parsing fails if there is no TargetName -[Failure0] - TargetAlias "Data Disk1" - Mapping PortalGroup1 InitiatorGroup1 - AuthMethod Auto - AuthGroup AuthGroup1 - UseDigest Auto - QueueDepth 128 - LUN0 Malloc0 - LUN1 Malloc1 - -# Test that parsing fails if there is no Mapping -[Failure1] - TargetName target1 - TargetAlias "Data Disk1" - AuthMethod Auto - AuthGroup AuthGroup1 - UseDigest Auto - QueueDepth 128 - LUN0 Malloc0 - LUN1 Malloc1 - -# Test that parsing fails if Mapping does not define Portal or InitiatorGroup -[Failure2] - TargetName target1 - TargetAlias "Data Disk1" - Mapping - AuthMethod Auto - AuthGroup AuthGroup1 - UseDigest Auto - QueueDepth 128 - LUN0 Malloc0 - LUN1 Malloc1 - -# Test that parsing fails if Mapping does not define InitiatorGroup -[Failure3] - TargetName target1 - TargetAlias "Data Disk1" - Mapping PortalGroup1 - AuthMethod Auto - AuthGroup AuthGroup1 - UseDigest Auto - QueueDepth 128 - LUN0 Malloc0 - LUN1 Malloc1 - -# Test that parsing fails if Mapping switches PortalGroup/InitiatorGroup order -[Failure4] - TargetName target1 - TargetAlias "Data Disk1" - Mapping InitiatorGroup1 PortalGroup1 - AuthMethod Auto - AuthGroup AuthGroup1 - UseDigest Auto - QueueDepth 128 - LUN0 Malloc0 - LUN1 Malloc1 - -# Test that parsing fails if Mapping uses invalid InitiatorGroup0 -[Failure5] - TargetName target1 - TargetAlias "Data Disk1" - Mapping PortalGroup1 InitiatorGroup0 - AuthMethod Auto - AuthGroup AuthGroup1 - UseDigest Auto - QueueDepth 128 - LUN0 Malloc0 - LUN1 Malloc1 - -# Test that parsing fails if Mapping uses invalid PortalGroup0 -[Failure6] - TargetName target1 - TargetAlias "Data Disk1" - Mapping PortalGroup0 InitiatorGroup1 - AuthMethod Auto - AuthGroup AuthGroup1 - UseDigest Auto - QueueDepth 128 - LUN0 Malloc0 - LUN1 Malloc1 - -# Test that parsing fails if AuthMethod is invalid -[Failure7] - TargetName target1 - TargetAlias "Data Disk1" - Mapping PortalGroup1 InitiatorGroup1 - AuthMethod SomeGarbage - AuthGroup AuthGroup1 - UseDigest Auto - QueueDepth 128 - LUN0 Malloc0 - LUN1 Malloc1 diff --git a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c index 8ac0bdfee..8e1fcad3a 100644 --- a/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c +++ b/test/unit/lib/iscsi/tgt_node.c/tgt_node_ut.c @@ -46,8 +46,6 @@ struct spdk_iscsi_globals g_iscsi; -const char *config_file; - DEFINE_STUB(spdk_scsi_dev_get_id, int, (const struct spdk_scsi_dev *dev), @@ -768,16 +766,9 @@ main(int argc, char **argv) CU_pSuite suite = NULL; unsigned int num_failures; - if (argc < 2) { - fprintf(stderr, "usage: %s \n", argv[0]); - exit(1); - } - CU_set_error_action(CUEA_ABORT); CU_initialize_registry(); - config_file = argv[1]; - suite = CU_add_suite("iscsi_target_node_suite", NULL, NULL); CU_ADD_TEST(suite, add_lun_test_cases); diff --git a/test/unit/unittest.sh b/test/unit/unittest.sh index b6a9774ec..f55290edd 100755 --- a/test/unit/unittest.sh +++ b/test/unit/unittest.sh @@ -56,10 +56,10 @@ function unittest_ftl() { function unittest_iscsi() { $valgrind $testdir/lib/iscsi/conn.c/conn_ut $valgrind $testdir/lib/iscsi/param.c/param_ut - $valgrind $testdir/lib/iscsi/tgt_node.c/tgt_node_ut $testdir/lib/iscsi/tgt_node.c/tgt_node.conf + $valgrind $testdir/lib/iscsi/tgt_node.c/tgt_node_ut $valgrind $testdir/lib/iscsi/iscsi.c/iscsi_ut - $valgrind $testdir/lib/iscsi/init_grp.c/init_grp_ut $testdir/lib/iscsi/init_grp.c/init_grp.conf - $valgrind $testdir/lib/iscsi/portal_grp.c/portal_grp_ut $testdir/lib/iscsi/portal_grp.c/portal_grp.conf + $valgrind $testdir/lib/iscsi/init_grp.c/init_grp_ut + $valgrind $testdir/lib/iscsi/portal_grp.c/portal_grp_ut } function unittest_json() {