[Libstoragemgmt-devel] [PATCH] test: fix test

[Gris Ge]

* Remove capability check in tester.c as 'simc://' and 'sim://' are not
sharing the same un-support capabilities list.

* Remove '--init-type' from cmdtest.py

Signed-off-by: Gris Ge <***@redhat.com>
---
test/cmdtest.py | 7 ++-----
test/tester.c | 22 ++--------------------
2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/test/cmdtest.py b/test/cmdtest.py
index 0dcd91c..9ad8cd3 100755
--- a/test/cmdtest.py
+++ b/test/cmdtest.py
@@ -194,15 +194,13 @@ def delete_fs(fs_id):

def access_group_create(init_id, system_id):
out = call([cmd, '-t' + sep, 'access-group-create', '--name', rs(8),
- '--init', init_id, '--init-type', 'ISCSI',
- '--sys', system_id])[1]
+ '--init', init_id, '--sys', system_id])[1]
r = parse(out)
return r[0][ID]


def access_group_initiator_add(group, initiator):
- call([cmd, 'access-group-add', '--ag', group, '--init', initiator,
- '--init-type', 'ISCSI'])
+ call([cmd, 'access-group-add', '--ag', group, '--init', initiator,])


def access_group_remove_init(group, initiator):
@@ -363,7 +361,6 @@ def initiator_grant(initiator_id, vol_id):
call([cmd,
'access-grant',
'--init', initiator_id,
- '--init-type', 'ISCSI',
'--vol', vol_id,
'--access', 'RW'])

diff --git a/test/tester.c b/test/tester.c
index 8d56386..a4c357e 100644
--- a/test/tester.c
+++ b/test/tester.c
@@ -2097,26 +2097,6 @@ START_TEST(test_capability)
LSM_CAP_EXPORT_REMOVE};

lsm_capability_type expected_absent[] = {
- LSM_CAP_EXPORT_CUSTOM_PATH,
- LSM_CAP_POOL_CREATE,
- LSM_CAP_POOL_CREATE_FROM_DISKS,
- LSM_CAP_POOL_CREATE_FROM_POOL,
-
- LSM_CAP_POOL_CREATE_DISK_RAID_0,
- LSM_CAP_POOL_CREATE_DISK_RAID_1,
- LSM_CAP_POOL_CREATE_DISK_RAID_JBOD,
- LSM_CAP_POOL_CREATE_DISK_RAID_3,
- LSM_CAP_POOL_CREATE_DISK_RAID_4,
- LSM_CAP_POOL_CREATE_DISK_RAID_5,
- LSM_CAP_POOL_CREATE_DISK_RAID_6,
- LSM_CAP_POOL_CREATE_DISK_RAID_10,
- LSM_CAP_POOL_CREATE_DISK_RAID_50,
- LSM_CAP_POOL_CREATE_DISK_RAID_51,
- LSM_CAP_POOL_CREATE_DISK_RAID_60,
- LSM_CAP_POOL_CREATE_DISK_RAID_61,
- LSM_CAP_POOL_CREATE_DISK_RAID_15,
- LSM_CAP_POOL_CREATE_DISK_RAID_16,
- LSM_CAP_POOL_CREATE_DISK_RAID_NOT_APPLICABLE
};


@@ -2186,6 +2166,8 @@ START_TEST(test_capability)
i < sizeof(expected_absent)/sizeof(expected_absent[0]);
++i) {

+ printf("testing capability: %d\n", expected_absent[i]);
+ printf("capa: %d\n", lsm_capability_get(cap, expected_absent[i]));
fail_unless( lsm_capability_get(cap, expected_absent[i]) ==
LSM_CAPABILITY_UNSUPPORTED);
}