Roy Golan has submitted this change and it was merged. Change subject: core: Re-fix DAO tests ......................................................................
core: Re-fix DAO tests The previous fix to the DAO tests (I627a3e291546b6a3c3d544c6f1914950f26298e0) wrongfully assumed that Shared Disk feature was already MERGED, and thus creates a subtly illegal database (multiple VMs connected to the same disk), which caused test to fail randomly. This patch reverts most of those changes, and introduces a stable version of fixtures.xml and the tests based on it. Change-Id: I74a1db8953168887e54bc07bcd2f2a232e60d53d --- M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmDeviceDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml 6 files changed, 20 insertions(+), 52 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, but someone else must approve Roy Golan: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/3040 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74a1db8953168887e54bc07bcd2f2a232e60d53d Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofren...@redhat.com> Gerrit-Reviewer: Roy Golan <rgo...@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
