~cprov/uci-engine/tarmac-multienv

« back to all changes in this revision

Viewing changes to ticket_system/ticket/tests/test_read_api.py

  • Committer: Evan Dandrea
  • Date: 2014-06-30 12:07:54 UTC
  • mfrom: (630 uci-engine)
  • mto: This revision was merged to the branch mainline in revision 655.
  • Revision ID: evan.dandrea@canonical.com-20140630120754-z6x5eqdahpp2qfrt
Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
87
87
                    u'removed_binaries': self.ticket.removed_binaries,
88
88
                    u'base_image': unicode(self.ticket.base_image),
89
89
                    u'id': self.ticket.pk,
 
90
                    u'lander_unit': 0,
90
91
                    u'master_ppa': unicode(self.ticket.master_ppa),
91
92
                    u'resource_uri': u'/api/v1/ticket/{0}/'.format(
92
93
                        self.ticket.pk),
123
124
                u'removed_binaries': self.ticket.removed_binaries,
124
125
                u'base_image': unicode(self.ticket.base_image),
125
126
                u'id': self.ticket.pk,
 
127
                u'lander_unit': 0,
126
128
                u'master_ppa': unicode(self.ticket.master_ppa),
127
129
                u'resource_uri': u'/api/v1/ticket/{0}/'.format(
128
130
                    self.ticket.pk),
168
170
                    TicketWorkflowStep)),
169
171
                u'description': unicode(self.ticket.description),
170
172
                u'id': self.ticket.pk,
 
173
                u'lander_unit': 0,
171
174
                u'master_ppa': unicode(self.ticket.master_ppa),
172
175
                u'owner': unicode(self.ticket.owner),
173
176
                u'removed_binaries': self.ticket.removed_binaries,
199
202
            u'removed_binaries': self.ticket.removed_binaries,
200
203
            u'base_image': unicode(self.ticket.base_image),
201
204
            u'id': self.ticket.pk,
 
205
            u'lander_unit': 0,
202
206
            u'master_ppa': unicode(self.ticket.master_ppa),
203
207
            u'resource_uri': u'/api/v1/ticket/{0}/'.format(
204
208
                self.ticket.pk),
225
229
        obj = self.getResource('updateticketstatus/')
226
230
        self.assertEqual(obj['objects'][0], {
227
231
            u'id': self.ticket.pk,
 
232
            u'lander_unit': 0,
228
233
            u'resource_uri':
229
234
            u'/api/v1/updateticketstatus/{0}/'.format(self.ticket.pk),
230
235
            u'current_workflow_step': unicode(get_enum_title(
239
244
            'updateticketstatus/?id={}'.format(self.ticket.pk))
240
245
        self.assertEqual(obj['objects'][0], {
241
246
            u'id': self.ticket.pk,
 
247
            u'lander_unit': 0,
242
248
            u'resource_uri':
243
249
            u'/api/v1/updateticketstatus/{0}/'.format(self.ticket.pk),
244
250
            u'current_workflow_step': unicode(get_enum_title(
442
448
            u'removed_binaries': self.ticket_6.removed_binaries,
443
449
            u'base_image': unicode(self.ticket_6.base_image),
444
450
            u'id': self.ticket_6.pk,
 
451
            u'lander_unit': self.ticket_6.lander_unit,
445
452
            u'master_ppa': unicode(self.ticket_6.master_ppa),
446
453
            u'resource_uri': u'/api/v1/opentickets/{0}/'.format(
447
454
                self.ticket_6.pk),