Ubuntu CI Services

Merge lp:~cjohnston/ubuntu-ci-services-itself/s-ticket_component-subticket into lp:ubuntu-ci-services-itself

  1. s-ticket_component-subticket
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Francis Ginther
Approved revision: 61
Merged at revision: 61
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/s-ticket_component-subticket
Merge into: lp:ubuntu-ci-services-itself
Prerequisite: lp:~cjohnston/ubuntu-ci-services-itself/ts-ticket-more-write-api
Diff against target: 191 lines (+19/-17)
9 files modified
docs/components/ticket-system.rst (+5/-2)
ticket_system/ticket/admin.py (+1/-1)
ticket_system/ticket/api.py (+1/-2)
ticket_system/ticket/migrations/0001_initial.py (+2/-2)
ticket_system/ticket/models.py (+1/-1)
ticket_system/ticket/tests/test_full_read_api.py (+1/-1)
ticket_system/ticket/tests/test_models.py (+4/-4)
ticket_system/ticket/tests/test_read_api.py (+2/-2)
ticket_system/ticket/tests/test_write_api.py (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/s-ticket_component-subticket
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Ursula Junque (community) Approve
Review via email: mp+199867@code.launchpad.net

Commit message

Renames ticket_component to subticket for continuity

To post a comment you must log in.
Revision history for this message
Ursula Junque (ursinha) wrote :

Yes! Thanks :)

review: Approve
lp:~cjohnston/ubuntu-ci-services-itself/s-ticket_component-subticket updated
60. By Chris Johnston

[r=Francis Ginther] Add a write API to the TS SubTicket/SPU/Artifact resources from Chris Johnston

61. By Chris Johnston

Rename ticket_component

Revision history for this message
Francis Ginther (fginther) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/components/ticket-system.rst'
2--- docs/components/ticket-system.rst 2013-12-20 19:41:18 +0000
3+++ docs/components/ticket-system.rst 2013-12-20 22:41:45 +0000
4@@ -183,12 +183,13 @@
5
6 ::
7
8- curl --dump-header - -H "Content-Type: application/json" -X POST --data '{"name": "my_artifact", "ticket_component": "/api/v1/ticket/X/", "reference": "http://path.to/artifact/", "type": "SPU"}' http://localhost:8000/api/v1/artifact/
9+ curl --dump-header - -H "Content-Type: application/json" -X POST --data '{"name": "my_artifact", "subticket": "/api/v1/ticket/X/", "reference": "http://path.to/artifact/", "type": "SPU"}' http://localhost:8000/api/v1/artifact/
10
11 create_subticket
12 ~~~~~~~~~~~~~~~~
13
14 ::
15+
16 curl --dump-header - -H "Content-Type: application/json" -X POST --data '{"source_package_upload": "/api/v1/spu/X/, "ticket": "/api/v1/ticket/X/, "assignee": "test@example.com"}' http://localhost:8000/api/v1/subticket/
17
18 Person
19@@ -271,6 +272,7 @@
20 *return all binary packages*
21
22 ::
23+
24 curl --dump-header - http://localhost:8000/api/v1/binarypackage/
25
26 add_binary_package
27@@ -350,6 +352,7 @@
28
29 subticket
30 ~~~~~~~~~
31+
32 ::
33
34 class SubTicket(models.Model):
35@@ -376,7 +379,7 @@
36
37 class Artifact(models.Model):
38 type = models.CharField(choices=["test_result", "source_upload", "test_failure_log"]
39- ticket_component = models.ForeignKey("TicketComponent")
40+ subticket = models.ForeignKey("subticket")
41 reference = models.CharField(max_length=4096) # Provided by the artifact manager
42
43 person
44
45=== modified file 'ticket_system/ticket/admin.py'
46--- ticket_system/ticket/admin.py 2013-12-11 19:09:46 +0000
47+++ ticket_system/ticket/admin.py 2013-12-20 22:41:45 +0000
48@@ -37,7 +37,7 @@
49 class ArtifactAdmin(admin.ModelAdmin):
50 list_filter = ['type']
51 search_fields = ['name']
52- list_display = ('name', 'ticket_component', 'type')
53+ list_display = ('name', 'subticket', 'type')
54
55 admin.site.register(Ticket, TicketAdmin)
56 admin.site.register(SubTicket, SubTicketAdmin)
57
58=== modified file 'ticket_system/ticket/api.py'
59--- ticket_system/ticket/api.py 2013-12-20 19:41:18 +0000
60+++ ticket_system/ticket/api.py 2013-12-20 22:41:45 +0000
61@@ -53,8 +53,7 @@
62
63
64 class ArtifactResource(ModelResource):
65- ticket_component = fields.ToOneField(SubTicketResource, 'ticket_component',
66- full=True)
67+ subticket = fields.ToOneField(SubTicketResource, 'subticket', full=True)
68
69 class Meta:
70 queryset = Artifact.objects.all()
71
72=== modified file 'ticket_system/ticket/migrations/0001_initial.py'
73--- ticket_system/ticket/migrations/0001_initial.py 2013-12-19 17:26:40 +0000
74+++ ticket_system/ticket/migrations/0001_initial.py 2013-12-20 22:41:45 +0000
75@@ -48,7 +48,7 @@
76 db.create_table('artifact', (
77 (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
78 ('type', self.gf('django.db.models.fields.CharField')(max_length=4096)),
79- ('ticket_component', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ticket.SubTicket'])),
80+ ('subticket', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['ticket.SubTicket'])),
81 ('reference', self.gf('django.db.models.fields.CharField')(max_length=4096)),
82 ('name', self.gf('django.db.models.fields.CharField')(max_length=4096)),
83 ))
84@@ -80,7 +80,7 @@
85 u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
86 'name': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
87 'reference': ('django.db.models.fields.CharField', [], {'max_length': '4096'}),
88- 'ticket_component': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ticket.SubTicket']"}),
89+ 'subticket': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['ticket.SubTicket']"}),
90 'type': ('django.db.models.fields.CharField', [], {'max_length': '4096'})
91 },
92 u'ticket.sourcepackageupload': {
93
94=== modified file 'ticket_system/ticket/models.py'
95--- ticket_system/ticket/models.py 2013-12-19 17:26:40 +0000
96+++ ticket_system/ticket/models.py 2013-12-20 22:41:45 +0000
97@@ -177,7 +177,7 @@
98 ('LOGS', 'Logs'),
99 )
100 type = models.CharField(choices=ARTIFACT_TYPE, max_length=4096)
101- ticket_component = models.ForeignKey(SubTicket)
102+ subticket = models.ForeignKey(SubTicket)
103 # 'reference' provided by the artifact manager
104 reference = models.CharField(max_length=4096)
105 name = models.CharField(max_length=4096)
106
107=== modified file 'ticket_system/ticket/tests/test_full_read_api.py'
108--- ticket_system/ticket/tests/test_full_read_api.py 2013-12-20 19:41:18 +0000
109+++ ticket_system/ticket/tests/test_full_read_api.py 2013-12-20 22:41:45 +0000
110@@ -27,7 +27,7 @@
111 sourcepackage=self.sourcepackage)
112 self.subticket = mommy.make('SubTicket', ticket=self.ticket,
113 source_package_upload=self.spu)
114- self.artifact = mommy.make('Artifact', ticket_component=self.subticket)
115+ self.artifact = mommy.make('Artifact', subticket=self.subticket)
116 self.maxDiff = None
117
118 def test_get_fullticket_api(self):
119
120=== modified file 'ticket_system/ticket/tests/test_models.py'
121--- ticket_system/ticket/tests/test_models.py 2013-12-19 17:26:40 +0000
122+++ ticket_system/ticket/tests/test_models.py 2013-12-20 22:41:45 +0000
123@@ -68,11 +68,11 @@
124 return subticket
125
126
127-def create_artifact(name="test.log", ticket_component=None,
128+def create_artifact(name="test.log", subticket=None,
129 reference='123abc'):
130 artifact = Artifact()
131 artifact.name = name
132- artifact.ticket_component = ticket_component
133+ artifact.subticket = subticket
134 artifact.reference = reference
135 artifact.save()
136 return artifact
137@@ -87,11 +87,11 @@
138 self.subticket = create_subticket(ticket=self.ticket,
139 assignee='test@example.com',
140 source_package_upload=self.spu)
141- self.artifact_1 = create_artifact(ticket_component=self.subticket)
142+ self.artifact_1 = create_artifact(subticket=self.subticket)
143
144 def test_creating_an_artifact(self):
145 artifact_in_database = Artifact.objects.exclude(
146- ticket_component=None)
147+ subticket=None)
148 self.assertEquals(len(artifact_in_database), 1)
149 only_artifact_in_database = artifact_in_database[0]
150 self.assertEquals(only_artifact_in_database, self.artifact_1)
151
152=== modified file 'ticket_system/ticket/tests/test_read_api.py'
153--- ticket_system/ticket/tests/test_read_api.py 2013-12-20 19:41:18 +0000
154+++ ticket_system/ticket/tests/test_read_api.py 2013-12-20 22:41:45 +0000
155@@ -27,14 +27,14 @@
156 sourcepackage=self.sourcepackage)
157 self.subticket = mommy.make('SubTicket', ticket=self.ticket,
158 source_package_upload=self.spu)
159- self.artifact = mommy.make('Artifact', ticket_component=self.subticket)
160+ self.artifact = mommy.make('Artifact', subticket=self.subticket)
161
162 def test_get_artifact_api(self):
163 obj = self.getResource('artifact/')
164 self.assertEqual(obj['objects'][0], {
165 u'name': unicode(self.artifact.name),
166 u'reference': unicode(self.artifact.reference),
167- u'ticket_component': {
168+ u'subticket': {
169 u'status': self.subticket.status,
170 u'current_workflow_step': self.subticket.current_workflow_step,
171 u'assignee': unicode(self.subticket.assignee),
172
173=== modified file 'ticket_system/ticket/tests/test_write_api.py'
174--- ticket_system/ticket/tests/test_write_api.py 2013-12-20 19:41:18 +0000
175+++ ticket_system/ticket/tests/test_write_api.py 2013-12-20 22:41:45 +0000
176@@ -154,14 +154,14 @@
177 def setUp(self):
178 super(APICreateArtifactResourceTest, self).setUp('/api/v1')
179 self.subticket = mommy.make('SubTicket')
180- self.artifact = mommy.make('Artifact', ticket_component=self.subticket)
181+ self.artifact = mommy.make('Artifact', subticket=self.subticket)
182 self.resource = 'artifact/'
183 self.detail_url = self.resource + '{0}/'.format(self.artifact.pk)
184 self.subticket_uri = '/api/v1/subticket/{0}/'.format(self.subticket.pk)
185 self.post_artifact_data = {
186 'type': 'SPU',
187 'name': 'my_artifact',
188- 'ticket_component': self.subticket_uri,
189+ 'subticket': self.subticket_uri,
190 'reference': 'm1CTLg5FHY',
191 }
192

Subscribers

People subscribed via source and target branches