Skip to content

Commit

Permalink
Fix review comments.
Browse files Browse the repository at this point in the history
  • Loading branch information
ycheng-aa committed Aug 12, 2015
1 parent 32d1beb commit d3c3cc2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
5 changes: 5 additions & 0 deletions pdc/apps/package/migrations/0003_buildimage_releases.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2015 Red Hat
# Licensed under The MIT License (MIT)
# http://opensource.org/licenses/MIT
#
from __future__ import unicode_literals

from django.db import models, migrations
Expand Down
5 changes: 5 additions & 0 deletions pdc/apps/package/migrations/0004_rpm_linked_releases.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# -*- coding: utf-8 -*-
#
# Copyright (c) 2015 Red Hat
# Licensed under The MIT License (MIT)
# http://opensource.org/licenses/MIT
#
from __future__ import unicode_literals

from django.db import models, migrations
Expand Down
13 changes: 8 additions & 5 deletions pdc/apps/package/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_empty_srpm_nevra_with_arch_is_not_src(self):
self.assertEqual(0, models.RPM.objects.count())


class RPMAPIRESTTestCase(APITestCase):
class RPMAPIRESTTestCase(TestCaseWithChangeSetMixin, APITestCase):
fixtures = [
'pdc/apps/common/fixtures/test/sigkey.json',
'pdc/apps/release/fixtures/tests/release.json',
Expand Down Expand Up @@ -127,7 +127,7 @@ def test_query_with_params(self):
response = self.client.get(url + '?compose=compose-1', format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data.get('count'), 2)
results = response.data.get('results')
results = response.data.get('results', [])
ids = []
for result in results:
ids.append(result['id'])
Expand Down Expand Up @@ -190,6 +190,7 @@ def test_create_rpm(self):
"arch": "x86_64", "srpm_name": "bash", "filename": "bash-1.2.3-4.b1.x86_64.rpm",
"linked_releases": ['release-1.0'], "srpm_nevra": "fake_bash-0:1.2.3-4.b1.src"}
self.assertEqual(response.data, expected_response_data)
self.assertNumChanges([1])

def test_create_rpm_with_wrong_release(self):
url = reverse('rpms-list')
Expand All @@ -205,6 +206,7 @@ def test_partial_update_rpm_with_assign_release(self):
response = self.client.patch(url, data, format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data.get('linked_releases'), ['release-1.0'])
self.assertNumChanges([1])

def test_partial_update_rpm_with_assign_wrong_release(self):
url = reverse('rpms-detail', args=[1])
Expand All @@ -221,6 +223,7 @@ def test_update_rpm(self):
self.assertEqual(response.status_code, status.HTTP_200_OK)
data.update({'id': 1, 'linked_composes': [u'compose-1']})
self.assertEqual(response.data, data)
self.assertNumChanges([1])

def test_update_rpm_with_linked_compose_should_read_only(self):
url = reverse('rpms-detail', args=[3])
Expand All @@ -229,12 +232,12 @@ def test_update_rpm_with_linked_compose_should_read_only(self):
self.assertEqual(response.data.get('linked_composes'), [])

def test_bulk_update_patch(self):
response = self.client.patch(reverse('rpms-list'),
{1: {"linked_releases": ['release-1.0']}},
format='json')
self.client.patch(reverse('rpms-list'),
{1: {"linked_releases": ['release-1.0']}}, format='json')
url = reverse('rpms-detail', args=[1])
response = self.client.get(url, format='json')
self.assertEqual(response.data.get("linked_releases"), ['release-1.0'])
self.assertNumChanges([1])


class ImageRESTTestCase(APITestCase):
Expand Down
12 changes: 1 addition & 11 deletions pdc/apps/package/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from rest_framework import viewsets, mixins

from pdc.apps.common import viewsets as pdc_viewsets
from contrib.bulk_operations import bulk_operations
from . import models
from . import serializers
from . import filters
Expand Down Expand Up @@ -47,7 +46,7 @@ def list(self, *args, **kwargs):
"previous": url,
"results": [
{
"id": integer,
"id": int,
"name": string,
"version": string,
"epoch": int,
Expand Down Expand Up @@ -106,15 +105,6 @@ def create(self, request, *args, **kwargs):
"""
return super(RPMViewSet, self).create(request, *args, **kwargs)

def bulk_update(self, *args, **kwargs):
"""
It is possible to perform bulk partial update on rpm with `PATCH`
method. The input must be a JSON object with rpm id as
keys. Values for these keys should be in the same format as when
updating a single compose.
"""
return bulk_operations.bulk_update_impl(self, *args, **kwargs)

def retrieve(self, request, *args, **kwargs):
"""
__Method__:
Expand Down

0 comments on commit d3c3cc2

Please sign in to comment.