X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Flockfile.at;h=2e2a74b47f2f2e6cc6310eb0dbcff2af3a27d79d;hb=607bfcb5b86374b3842282579384b19ad86f3395;hp=ba10fd44f91871db7f8a8d4840433be33e54ae35;hpb=f5ca49d849c9526f7aabbca1a6d171d4132f7ea3;p=sliver-openvswitch.git

diff --git a/tests/lockfile.at b/tests/lockfile.at
index ba10fd44f..2e2a74b47 100644
--- a/tests/lockfile.at
+++ b/tests/lockfile.at
@@ -14,12 +14,12 @@ CHECK_LOCKFILE([lock_and_unlock], [0])
 CHECK_LOCKFILE([lock_and_unlock_twice], [0])
 
 CHECK_LOCKFILE([lock_blocks_same_process], [0],
-  [lockfile|WARN|.file.~lock~: failed to lock file: Resource deadlock avoided
+  [lockfile|WARN|.file.~lock~: cannot lock file because this process has already locked it
 ])
 
 CHECK_LOCKFILE([lock_blocks_same_process_twice], [0],
-  [lockfile|WARN|.file.~lock~: failed to lock file: Resource deadlock avoided
-lockfile|WARN|.file.~lock~: failed to lock file: Resource deadlock avoided
+  [lockfile|WARN|.file.~lock~: cannot lock file because this process has already locked it
+lockfile|WARN|.file.~lock~: cannot lock file because this process has already locked it
 ])
 
 CHECK_LOCKFILE([lock_blocks_other_process], [1],
@@ -28,7 +28,7 @@ lockfile|WARN|.file.~lock~: cannot lock file because it is already locked by pid
 ])
 
 CHECK_LOCKFILE([lock_twice_blocks_other_process], [1],
-  [lockfile|WARN|.file.~lock~: failed to lock file: Resource deadlock avoided
+  [lockfile|WARN|.file.~lock~: cannot lock file because this process has already locked it
 lockfile|WARN|.file.~lock~: child does not inherit lock
 lockfile|WARN|.file.~lock~: cannot lock file because it is already locked by pid <pid>
 ])
@@ -36,16 +36,16 @@ lockfile|WARN|.file.~lock~: cannot lock file because it is already locked by pid
 CHECK_LOCKFILE([lock_and_unlock_allows_other_process], [1])
 
 CHECK_LOCKFILE([lock_multiple], [0],
-  [lockfile|WARN|.a.~lock~: failed to lock file: Resource deadlock avoided
+  [lockfile|WARN|.a.~lock~: cannot lock file because this process has already locked it
 ])
 
 CHECK_LOCKFILE([lock_symlink], [0],
-  [lockfile|WARN|.a.~lock~: failed to lock file: Resource deadlock avoided
-lockfile|WARN|.b.~lock~: failed to lock file: Resource deadlock avoided
-lockfile|WARN|.b.~lock~: failed to lock file: Resource deadlock avoided
-lockfile|WARN|.a.~lock~: failed to lock file: Resource deadlock avoided
+  [lockfile|WARN|.a.~lock~: cannot lock file because this process has already locked it
+lockfile|WARN|.b.~lock~: cannot lock file because this process has already locked it
+lockfile|WARN|.b.~lock~: cannot lock file because this process has already locked it
+lockfile|WARN|.a.~lock~: cannot lock file because this process has already locked it
 ])
 
 CHECK_LOCKFILE([lock_symlink_to_dir], [0],
-  [lockfile|WARN|dir/.b.~lock~: failed to lock file: Resource deadlock avoided
+  [lockfile|WARN|dir/.b.~lock~: cannot lock file because this process has already locked it
 ])