From b0b449a7fb1b1d1e25dca6c9aa60536dc58a15ad Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 10 Feb 2015 13:55:13 +0000 Subject: [PATCH] regression tests: Follow-up for r5409 (merge r5475 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@6059 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- .../scstadmin.sysfs/scst-0.9.10/t/03-targets.t | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/03-targets.t b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/03-targets.t index 66585b0ff..f1b6bcac7 100644 --- a/scstadmin/scstadmin.sysfs/scst-0.9.10/t/03-targets.t +++ b/scstadmin/scstadmin.sysfs/scst-0.9.10/t/03-targets.t @@ -275,10 +275,10 @@ sub lunTest { Dumper(undef, "luns(): Target 'no-such-target' is not available")); ok(Dumper($SCST->luns('scst_local', 'local1')), Dumper({ '0' => 'disk01', '1' => 'disk02', '2' => 'disk01', - '3' => 'disk02' }, undef)); + '3' => 'disk02' })); ok(Dumper($SCST->luns('scst_local', 'local1', 'group1')), Dumper({ '0' => 'disk01', '2' => 'disk02', '4' => 'disk01', - '6' => 'disk02' }, undef)); + '6' => 'disk02' })); ok(lunReadOnly($SCST, 'scst_local', 'local1', 0), '0'); ok($SCST->setLunAttribute(), $SCST->SCST_C_LUN_SETATTR_FAIL); @@ -303,11 +303,11 @@ sub lunTest { ok($SCST->replaceLun('scst_local', 'local1', 0, 'disk02', {}), 0); ok(Dumper($SCST->luns('scst_local', 'local1')), Dumper({ '0' => 'disk02', '1' => 'disk02', '2' => 'disk01', - '3' => 'disk02' }, undef)); + '3' => 'disk02' })); ok($SCST->replaceLun('scst_local', 'local1', 0, 'disk01', {}), 0); ok(Dumper($SCST->luns('scst_local', 'local1')), Dumper({ '0' => 'disk01', '1' => 'disk02', '2' => 'disk01', - '3' => 'disk02' }, undef)); + '3' => 'disk02' })); ok($SCST->clearLuns(undef, undef), $SCST->SCST_C_TGT_CLR_LUN_FAIL); ok($SCST->clearLuns(undef, undef, 'group1'), @@ -323,16 +323,16 @@ sub lunTest { ok($SCST->removeLun('scst_local', 'local1', '8', 'group1'), $SCST->SCST_C_GRP_NO_LUN); ok($SCST->clearLuns('scst_local', 'local1'), 0); - ok(Dumper($SCST->luns('scst_local', 'local1')), Dumper({ }, undef)); + ok(Dumper($SCST->luns('scst_local', 'local1')), Dumper({ })); ok(Dumper($SCST->luns('scst_local', 'local1', 'group1')), Dumper({ '0' => 'disk01', '2' => 'disk02', '4' => 'disk01', - '6' => 'disk02' }, undef)); + '6' => 'disk02' })); ok($SCST->removeLun('scst_local', 'local1', '4', 'group1'), 0); ok(Dumper($SCST->luns('scst_local', 'local1', 'group1')), - Dumper({ '0' => 'disk01', '2' => 'disk02', '6' => 'disk02' }, undef)); + Dumper({ '0' => 'disk01', '2' => 'disk02', '6' => 'disk02' })); ok($SCST->clearLuns('scst_local', 'local1', 'group1'), 0); ok(Dumper($SCST->luns('scst_local', 'local1', 'group1')), - Dumper({ }, undef)); + Dumper({ })); ok($SCST->removeInitiator('scst_local', 'local1', 'group1', 'ini1'), 0); ok($SCST->removeGroup('scst_local', 'local1', 'group1'), 0);