x/mixmatch
Code Issues Proposed changes

Handle schema and first keys in aggregation

Browse Source 
Add ability to handle 'schema' and 'first' keys in aggregation,
which is necessary for proper aggregation of image responses which
contain these keys. Add test for the change.

Change-Id: Id4a5804994e245174fdca3b09cbc9a29d685be0f
This commit is contained in:
Eric Juma
2016-12-22 16:10:47 -05:00
parent 98dd35e1a5
commit ba8eb74a24
2 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mixmatch/tests/unit/test_images.py
View File

@@ -15,6 +15,7 @@
import six
import json
from mixmatch.tests.unit import samples
from mixmatch.tests.unit.base import BaseTest
from mixmatch.model import insert, ResourceMapping
@@ -172,42 +173,15 @@ class TestImages(BaseTest):
REMOTE_PROJECT_ID, 'remote-tok')
self.session_fixture.add_project_at_sp('remote1', REMOTE_PROJECT_ID)
LOCAL_IMAGES = json.dumps({
"images": [
{"id": "1bea47ed-f6a9-463b-b423-14b9cca9ad27",
"size": 4096},
{"id": "781b3762-9469-4cec-b58d-3349e5de4e9c",
"size": 476704768}
],
})
REMOTE1_IMAGES = json.dumps({
"images": [
{"id": "4af2929a-3c1f-4ccf-bf91-724444719c78",
"size": 13167626}
],
})
EXPECTED = {
"images": [
{"id": "1bea47ed-f6a9-463b-b423-14b9cca9ad27",
"size": 4096},
{"id": "4af2929a-3c1f-4ccf-bf91-724444719c78",
"size": 13167626},
{"id": "781b3762-9469-4cec-b58d-3349e5de4e9c",
"size": 476704768}
],
}
self.requests_fixture.get(
'http://images.local/v2/images',
text=LOCAL_IMAGES,
text=json.dumps(samples.multiple_sps['/image/v2/images'][0]),
status_code=200,
request_headers={'X-AUTH-TOKEN': 'local-tok'},
headers={'CONTENT-TYPE': 'application/json'})
self.requests_fixture.get(
'http://images.remote1/v2/images',
text=REMOTE1_IMAGES,
text=json.dumps(samples.multiple_sps['/image/v2/images'][1]),
status_code=200,
request_headers={'X-AUTH-TOKEN': 'remote-tok'},
headers={'CONTENT-TYPE': 'application/json'})
@@ -217,7 +191,9 @@ class TestImages(BaseTest):
headers={'X-AUTH-TOKEN': 'local-tok',
'CONTENT-TYPE': 'application/json'})
actual = json.loads(response.data.decode("ascii"))
actual['images'].sort(key=(lambda x: x[u'id']))
actual['images'].sort(key=lambda x: x['id'])
EXPECTED = samples.single_sp['/image/v2/images']
EXPECTED['images'].sort(key=lambda x: x['id'])
self.assertEqual(actual, EXPECTED)
def test_image_unversioned_calls_no_action(self):