Merge "Remove default function_version in webhook resource def"

This commit is contained in:
Zuul 2018-07-06 10:40:29 +00:00 committed by Gerrit Code Review
commit bf432e0969
2 changed files with 16 additions and 1 deletions

View File

@ -353,7 +353,7 @@ class ScaleInfo(Resource):
class Webhook(Resource):
id = types.uuid
function_id = types.uuid
function_version = wsme.wsattr(int, default=0)
function_version = wsme.wsattr(int)
description = wtypes.text
project_id = wsme.wsattr(wtypes.text, readonly=True)
created_at = wsme.wsattr(wtypes.text, readonly=True)

View File

@ -93,3 +93,18 @@ class TestWebhookController(base.APITest):
self.assertEqual(200, resp.status_int)
self.assertEqual(1, resp.json.get("function_version"))
def test_put_without_version(self):
db_api.increase_function_version(self.func_id, 0)
webhook = self.create_webhook(self.func_id, function_version=1)
self.assertEqual(1, webhook.function_version)
resp = self.app.put_json(
'/v1/webhooks/%s' % webhook.id,
{'description': 'updated description'}
)
self.assertEqual(200, resp.status_int)
self.assertEqual(1, resp.json.get("function_version"))
self.assertEqual('updated description', resp.json.get("description"))