From 3421272f7c112a88955bfe64f5b9f2f1db5276ce Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 18 Mar 2010 20:04:02 +1300 Subject: [PATCH] Confirm lock is removed by DELETE. --- .../tests/regression-suite/808-Spec-UNLOCK-1.result | 13 +++---------- .../tests/regression-suite/808-Spec-UNLOCK-1.test | 7 ++++++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/testing/tests/regression-suite/808-Spec-UNLOCK-1.result b/testing/tests/regression-suite/808-Spec-UNLOCK-1.result index f29a386a..cc598673 100644 --- a/testing/tests/regression-suite/808-Spec-UNLOCK-1.result +++ b/testing/tests/regression-suite/808-Spec-UNLOCK-1.result @@ -1,13 +1,6 @@ -HTTP/1.1 207 Multi-Status +HTTP/1.1 204 No Content Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy -Content-Length: 198 -Content-Type: text/xml; charset="utf-8" +Content-Length: 0 +Content-Type: text/plain; charset="utf-8" - - - - /user1/home/i1278618276.ics - HTTP/1.1 423 Resource Locked - - diff --git a/testing/tests/regression-suite/808-Spec-UNLOCK-1.test b/testing/tests/regression-suite/808-Spec-UNLOCK-1.test index b4e49348..1147f216 100644 --- a/testing/tests/regression-suite/808-Spec-UNLOCK-1.test +++ b/testing/tests/regression-suite/808-Spec-UNLOCK-1.test @@ -1,6 +1,11 @@ # # Test specification compliance for LOCK/UNLOCK request -# - This should fail because we provide an invalid lock token +# - This should succeed because the actual lock was deleted +# when the resource was deleted, regardless that the +# token we supply here is bogus. +# +# The response to this should really be 409 precondition +# failed 'lock-token-matches-request-uri' # TYPE=UNLOCK URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics