locking: fix the horribly-botched maxwait values

And generally clean up the timing

diff --git a/collections/multiclient/tasks/locking.yaml b/collections/multiclient/tasks/locking.yaml
index 865b3b6b7be386aa390b083b415b8ff2c2ccb9e5..71966d53b16a18e355ca8603c7b45ba055cc6227 100644 (file)
--- a/collections/multiclient/tasks/locking.yaml
+++ b/collections/multiclient/tasks/locking.yaml
@@ -1,10 +1,11 @@
+kernel:
 tasks:
 - ceph:
 - kclient:
-- lockfile: [{client: client.0, lockfile: testfile, holdtime: 5, maxwait: 1},
-             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 11},
-             {client: client.1, lockfile: testfile, holdtime: 0, maxwait: 0, expectfail: True},
-             10,
-             {client: client.0, lockfile: testfile, holdtime: 5, maxwait: 1},
-             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 1, expectfail: True},
-             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 11}]
+- lockfile: [{client: client.0, lockfile: testfile, holdtime: 5, maxwait: 6},
+             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 12},
+             {client: client.1, lockfile: testfile, holdtime: 0, maxwait: 3, expectfail: True},
+             20,
+             {client: client.0, lockfile: testfile, holdtime: 5, maxwait: 15},
+             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 3, expectfail: True},
+             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 15}]