openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: hostdev: Remove magic numbers 

When checking the number of devices added to a device list, use the
nhostdevs variable instead of its value, so that the test can keep
working even if more hostdevs are added.
This commit is contained in:
Andrea Bolognani 2016-03-02 13:17:08 +01:00
parent 18f231e6ff
commit 9f506fdb6b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/virhostdevtest.c
View File

@ -181,8 +181,8 @@ testVirHostdevPreparePCIHostdevs_unmanaged(const void *opaque ATTRIBUTE_UNUSED)
if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid,
hostdevs, nhostdevs, 0) < 0)
goto cleanup;
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 + 3);
CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2 - 3);
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 + nhostdevs);
CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2 - nhostdevs);
/* Test conflict */
count1 = virPCIDeviceListCount(mgr->activePCIHostdevs);
@ -239,8 +239,8 @@ testVirHostdevReAttachPCIHostdevs_unmanaged(const void *opaque ATTRIBUTE_UNUSED)
VIR_DEBUG("Test >=1 unmanaged hostdevs");
virHostdevReAttachPCIDevices(mgr, drv_name, dom_name,
hostdevs, nhostdevs, NULL);
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - 3);
CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2 + 3);
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - nhostdevs);
CHECK_LIST_COUNT(mgr->inactivePCIHostdevs, count2 + nhostdevs);
ret = 0;
@ -266,7 +266,7 @@ testVirHostdevPreparePCIHostdevs_managed(const void *opaque ATTRIBUTE_UNUSED)
if (virHostdevPreparePCIDevices(mgr, drv_name, dom_name, uuid,
hostdevs, nhostdevs, 0) < 0)
goto cleanup;
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 + 3);
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 + nhostdevs);
/* Test conflict */
count1 = virPCIDeviceListCount(mgr->activePCIHostdevs);
@ -318,7 +318,7 @@ testVirHostdevReAttachPCIHostdevs_managed(const void *opaque ATTRIBUTE_UNUSED)
VIR_DEBUG("Test >=1 hostdevs");
virHostdevReAttachPCIDevices(mgr, drv_name, dom_name,
hostdevs, nhostdevs, NULL);
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - 3);
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 - nhostdevs);
ret = 0;
@ -403,7 +403,7 @@ testVirHostdevUpdateActivePCIHostdevs(const void *opaque ATTRIBUTE_UNUSED)
if (virHostdevUpdateActivePCIDevices(mgr, hostdevs, nhostdevs,
drv_name, dom_name) < 0)
goto cleanup;
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 + 3);
CHECK_LIST_COUNT(mgr->activePCIHostdevs, count1 + nhostdevs);
ret = 0;