Change in vdsm[ovirt-3.5]: tests: Fix RescanTimeoutsTests

ybronhei at redhat.com ybronhei at redhat.com
Sun Apr 12 16:33:04 UTC 2015


Yaniv Bronhaim has submitted this change and it was merged.

Change subject: tests: Fix RescanTimeoutsTests
......................................................................


tests: Fix RescanTimeoutsTests

In commit 4c10d3d10c (multipath: Wait for udev events after rescan) I
removed unneeded and badly implemented minimal timeout, and the unneeded
optional arguments in iscsi.rescan() but forgot to update the tests.

In this patch:

- remove the now unneeded and broken test for minimal timeout
  (the test was passing while the code was broken)
- simplify the testing infrastructure
- instead of passing arguments to rescan, monkey-patch the config.
- use safe monkey-patching.
- use monotonic_time
- use real process so we get SIGCHLD when the scan is finished;
  otherwise, the tests may pass while the code is broken
- add test for normal operation

make_config and monotonic_time defined locally in the test because they
don't exist on ovirt 3.5 branch.

Change-Id: I308c73eb7059053aa91bf15957cf9029234b37d1
Bug-Url: https://bugzilla.redhat.com/1209028
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
Signed-off-by: Ala Hino <ahino at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/39422
Reviewed-by: Francesco Romani <fromani at redhat.com>
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/39609
Reviewed-by: Allon Mureinik <amureini at redhat.com>
Reviewed-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M tests/iscsiTests.py
1 file changed, 30 insertions(+), 56 deletions(-)

Approvals:
  Nir Soffer: Looks good to me, but someone else must approve
  Yaniv Bronhaim: Looks good to me, approved
  Allon Mureinik: Looks good to me, but someone else must approve
  Ala Hino: Verified



-- 
To view, visit https://gerrit.ovirt.org/39609
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I308c73eb7059053aa91bf15957cf9029234b37d1
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Ala Hino <ahino at redhat.com>
Gerrit-Reviewer: Ala Hino <ahino at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani at redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: automation at ovirt.org


More information about the vdsm-patches mailing list