Merge lp:~cjohnston/ubuntu-ci-services-itself/ts-people-ci-utils into lp:ubuntu-ci-services-itself

[Chris Johnston]

Switch ts people app to use ci-utils

[Andy Doan (doanac)]

review: Approve

=== modified file 'ticket_system/people/tests.py'
--- ticket_system/people/tests.py	2013-12-09 17:43:12 +0000
+++ ticket_system/people/tests.py	2013-12-10 18:41:22 +0000
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.test import TestCase
-from tastypie.test import ResourceTestCase
+from ci_utils.tastypie.test import TastypieTestCase
 from people.models import Person
 
 
@@ -43,19 +43,17 @@
                           "[e-mail]")
 
 
-class PersonResourceTest(ResourceTestCase):
+class PersonResourceTest(TastypieTestCase):
 
     def setUp(self):
-        super(PersonResourceTest, self).setUp()
+        super(PersonResourceTest, self).setUp('/api/v1')
         create_person()
         self.person_1 = Person.objects.get(name='Chris Johnston')
-        self.detail_url = '/api/v1/person/{0}/'.format(self.person_1.pk)
+        self.detail_url = 'person/{0}/'.format(self.person_1.pk)
 
     def test_get_person_list_json(self):
-        resp = self.api_client.get('/api/v1/person/', format='json')
-        self.assertValidJSONResponse(resp)
-        self.assertEqual(len(self.deserialize(resp)['objects']), 1)
-        self.assertEqual(self.deserialize(resp)['objects'][0], {
+        obj = self.getResource('person/')
+        self.assertEqual(obj['objects'][0], {
             u'email': u'[e-mail]',
             u'id': self.person_1.pk,
             u'is_team': False,
@@ -64,9 +62,8 @@
         })
 
     def test_get_person_detail_json(self):
-        resp = self.api_client.get(self.detail_url)
-        self.assertValidJSONResponse(resp)
+        obj = self.getResource(self.detail_url)
 
-        self.assertKeys(self.deserialize(resp),
+        self.assertKeys(obj,
                         ['email', 'id', 'is_team', 'name', 'resource_uri'])
-        self.assertEqual(self.deserialize(resp)['name'], 'Chris Johnston')
+        self.assertEqual(obj['name'], 'Chris Johnston')