diff --git a/marconi/tests/transport/wsgi/test_claims.py b/marconi/tests/transport/wsgi/test_claims.py index e64e035c5..58c27e6c0 100644 --- a/marconi/tests/transport/wsgi/test_claims.py +++ b/marconi/tests/transport/wsgi/test_claims.py @@ -102,8 +102,8 @@ class ClaimsBaseTest(base.TestBase): self.assertEquals(self.srmock.status, falcon.HTTP_404) # Update the claim - new_claim = '{"ttl": 60, "grace": 60}' - self.simulate_patch(claim_href, self.project_id, body=new_claim) + new_claim_ttl = '{"ttl": 60}' + self.simulate_patch(claim_href, self.project_id, body=new_claim_ttl) self.assertEquals(self.srmock.status, falcon.HTTP_204) # Get the claimed messages (again) @@ -180,8 +180,8 @@ class ClaimsFaultyDriverTests(base.TestBaseFaulty): self.simulate_get(claims_path + '/nichts', project_id) self.assertEquals(self.srmock.status, falcon.HTTP_503) - self.simulate_patch(claims_path, project_id, body=doc) - self.assertEquals(self.srmock.status, falcon.HTTP_405) + self.simulate_patch(claims_path + '/nichts', project_id, body=doc) + self.assertEquals(self.srmock.status, falcon.HTTP_503) self.simulate_delete(claims_path + '/foo', project_id) self.assertEquals(self.srmock.status, falcon.HTTP_503) diff --git a/marconi/transport/wsgi/claims.py b/marconi/transport/wsgi/claims.py index a769d7265..ad4917b34 100644 --- a/marconi/transport/wsgi/claims.py +++ b/marconi/transport/wsgi/claims.py @@ -23,7 +23,8 @@ from marconi.transport.wsgi import helpers as wsgi_helpers LOG = logging.getLogger(__name__) -CLAIM_METADATA_SPEC = (('ttl', int), ('grace', int)) +CLAIM_POST_SPEC = (('ttl', int), ('grace', int)) +CLAIM_PATCH_SPEC = (('ttl', int),) class CollectionResource(object): @@ -41,7 +42,7 @@ class CollectionResource(object): # Read claim metadata (e.g., TTL) and raise appropriate # HTTP errors as needed. metadata, = wsgi_helpers.filter_stream(req.stream, req.content_length, - CLAIM_METADATA_SPEC) + CLAIM_POST_SPEC) # Claim some messages try: @@ -121,7 +122,7 @@ class ItemResource(object): # Read claim metadata (e.g., TTL) and raise appropriate # HTTP errors as needed. metadata, = wsgi_helpers.filter_stream(req.stream, req.content_length, - CLAIM_METADATA_SPEC) + CLAIM_PATCH_SPEC) try: self.claim_controller.update(queue_name,