x/poppy
Code Issues Proposed changes

Merge "Update PATCH api tests"

Browse Source
This commit is contained in:
Jenkins
2015-01-16 16:15:19 +00:00
committed by Gerrit Code Review
parent a208fda572 3eec1ef6d7
commit 7b2bc8ed73
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/api/services/data_patch_service_negative.json
View File

@@ -43,10 +43,6 @@
"path": "/caching/-",
"value": {"name": "cache_name", "ttl": 111}}
],
"remove_caching": [
{"op": "remove",
"path": "/caching/0"}
],
"replace_domain_invalid_protocol": [
{"op": "replace",
"path": "/domains/0",

21
tests/api/services/test_services.py
View File

@@ -469,11 +469,18 @@ class TestServicePatch(base.TestBase):
"rules": [{"name": "index",
"request_url": "/index.htm"}]}]
resp = self.client.create_service(service_name=self.service_name,
domain_list=self.domain_list,
origin_list=self.origin_list,
caching_list=self.caching_list,
flavor_id=self.flavor_id)
self.restrictions_list = [
{"name": "website only",
"rules": [{"name": "mywebsite.com",
"http_host": "www.mywebsite.com"}]}]
resp = self.client.create_service(
service_name=self.service_name,
domain_list=self.domain_list,
origin_list=self.origin_list,
caching_list=self.caching_list,
restrictions_list=self.restrictions_list,
flavor_id=self.flavor_id)
self.service_url = resp.headers["location"]
@@ -482,7 +489,7 @@ class TestServicePatch(base.TestBase):
"domains": self.domain_list,
"origins": self.origin_list,
"caching": self.caching_list,
"restrictions": [],
"restrictions": self.restrictions_list,
"flavor_id": self.flavor_id}
self.client.wait_for_service_status(
@@ -559,7 +566,7 @@ class TestServicePatch(base.TestBase):
item[u'rules'] = []
self.assertEqual(sorted(self.origin_list), sorted(body['origins']))
# TODO(malini): Uncomment below after caching is implemented.
# self.assertEqual(sorted(self.caching_list), sorted(body['caching']))
self.assertEqual(sorted(self.caching_list), sorted(body['caching']))
def tearDown(self):
self.client.delete_service(location=self.service_url)