shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00
Code Releases Activity

tests: iscsitest: split out testISCSIScanTargetsTests

Browse Source 
The ScanTargets testing code declares some variables
in the middle of main.

Split it out into a separate function.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2020-07-28 20:11:09 +02:00
parent c23c7dac9b
commit aeb59ff576
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/viriscsitest.c
View File

@ -310,6 +310,29 @@ testISCSIConnectionLogin(const void *data)
} }
static int
testISCSIScanTargetsTests(void)
{
const char *targets[] = {
"iqn.2004-06.example:example1:iscsi.test",
"iqn.2005-05.example:example1:iscsi.hello",
"iqn.2006-04.example:example1:iscsi.world",
"iqn.2007-04.example:example1:iscsi.foo",
"iqn.2008-04.example:example1:iscsi.bar",
"iqn.2009-04.example:example1:iscsi.seven"
};
struct testScanTargetsInfo infoTargets = {
.fake_cmd_output = "iscsiadm_sendtargets",
.portal = "10.20.30.40:3260,1",
.expected_targets = targets,
.nexpected = G_N_ELEMENTS(targets),
};
if (virTestRun("ISCSI scan targets", testISCSIScanTargets, &infoTargets) < 0)
return -1;
return 0;
}
static int static int
mymain(void) mymain(void)
{ {
@ -331,21 +354,7 @@ mymain(void)
DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.seven", "7"); DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.seven", "7");
DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.eight", NULL); DO_SESSION_TEST("iqn.2009-04.example:example1:iscsi.eight", NULL);
const char *targets[] = { if (testISCSIScanTargetsTests() < 0)
"iqn.2004-06.example:example1:iscsi.test",
"iqn.2005-05.example:example1:iscsi.hello",
"iqn.2006-04.example:example1:iscsi.world",
"iqn.2007-04.example:example1:iscsi.foo",
"iqn.2008-04.example:example1:iscsi.bar",
"iqn.2009-04.example:example1:iscsi.seven"
};
struct testScanTargetsInfo infoTargets = {
.fake_cmd_output = "iscsiadm_sendtargets",
.portal = "10.20.30.40:3260,1",
.expected_targets = targets,
.nexpected = G_N_ELEMENTS(targets),
};
if (virTestRun("ISCSI scan targets", testISCSIScanTargets, &infoTargets) < 0)
rv = -1; rv = -1;
# define DO_LOGIN_TEST(portal, iqn, target) \ # define DO_LOGIN_TEST(portal, iqn, target) \