Allon Mureinik has posted comments on this change. Change subject: engine: remove the use of @LockIdNameAttribute ......................................................................
Patch Set 18: (1 comment) http://gerrit.ovirt.org/#/c/25944/18/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java: Line 1730: } Line 1731: return lockProperties; Line 1732: } Line 1733: Line 1734: protected boolean acquireLock() { > When I make it final unit test fail as Mockito is trying to create a mock f acquireLock() should never be called explicitly from anywhere but CommandBase, and hence shouldn't appear in tests either. The fact that it is is a bug. Let's keep the code like this /now/ in order to meet 3.5s' schedule, and file BZs for the three offenders: backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java Line 1735: LockProperties lockProperties = getLockProperties(); Line 1736: boolean returnValue = true; Line 1737: if (!Scope.None.equals(lockProperties.getScope())) { Line 1738: releaseLocksAtEndOfExecute = Scope.Execution.equals(lockProperties.getScope()); -- To view, visit http://gerrit.ovirt.org/25944 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie57e4f7c00ebcd6a4e9e0e61b7d26f50f2d00858 Gerrit-PatchSet: 18 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> Gerrit-Reviewer: Allon Mureinik <[email protected]> Gerrit-Reviewer: Alon Bar-Lev <[email protected]> Gerrit-Reviewer: Arik Hadas <[email protected]> Gerrit-Reviewer: Eli Mesika <[email protected]> Gerrit-Reviewer: Liron Aravot <[email protected]> Gerrit-Reviewer: Moti Asayag <[email protected]> Gerrit-Reviewer: Omer Frenkel <[email protected]> Gerrit-Reviewer: Oved Ourfali <[email protected]> Gerrit-Reviewer: Ravi Nori <[email protected]> Gerrit-Reviewer: Roy Golan <[email protected]> Gerrit-Reviewer: Sahina Bose <[email protected]> Gerrit-Reviewer: Tal Nisan <[email protected]> Gerrit-Reviewer: Yair Zaslavsky <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
