Ubuntu CI Services

Merge lp:~cjohnston/ubuntu-ci-services-itself/cli-sta-url into lp:ubuntu-ci-services-itself

  1. cli-sta-url
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 135
Merged at revision: 145
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/cli-sta-url
Merge into: lp:ubuntu-ci-services-itself
Prerequisite: lp:~cjohnston/ubuntu-ci-services-itself/ticket-artifact
Diff against target: 29 lines (+5/-3)
2 files modified
cli/ci_libs/utils.py (+1/-1)
cli/tests/test_ticket.py (+4/-2)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/cli-sta-url
Reviewer Review Type Date Requested Status
Chris Johnston (community) Approve
Andy Doan (community) Approve
Review via email: mp+203140@code.launchpad.net

Commit message

Update cli to work with the new subticketartifact url

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

 merge approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cli/ci_libs/utils.py'
2--- cli/ci_libs/utils.py 2014-01-24 15:02:18 +0000
3+++ cli/ci_libs/utils.py 2014-01-24 17:51:13 +0000
4@@ -29,7 +29,7 @@
5 TICKET_BASE = API_URL + 'ticket/'
6 SPU_BASE = API_URL + 'spu/'
7 SOURCEPACKAGE_BASE = API_URL + 'sourcepackage/'
8-ARTIFACT_BASE = API_URL + 'artifact/'
9+ARTIFACT_BASE = API_URL + 'subticketartifact/'
10 SUBTICKET_BASE = API_URL + 'subticket/'
11
12 config_file = os.path.join(os.environ["HOME"], '.ubuntu-ci/config.yaml')
13
14=== modified file 'cli/tests/test_ticket.py'
15--- cli/tests/test_ticket.py 2014-01-22 01:53:57 +0000
16+++ cli/tests/test_ticket.py 2014-01-24 17:51:13 +0000
17@@ -59,8 +59,10 @@
18 new_subticket._parse_changes(self.changes)
19 new_subticket._create_spu()
20
21- @mock.patch('ci_libs.ticket.post',
22- return_value='http://www.example.com/api/v1/artifact/38/')
23+ @mock.patch(
24+ 'ci_libs.ticket.post',
25+ return_value='http://www.example.com/api/v1/subticketartifact/38/',
26+ )
27 def test_create_artifact(self, mock_post):
28 new_subticket = SubTicket(owner='foobar@example.com', ticket_id=2)
29 file = 'foobar_source.changes'

Subscribers

People subscribed via source and target branches