Ubuntu CI Engine

Merge lp:~cjohnston/uci-engine/ts-amulet-test-fixes into lp:uci-engine

  1. ts-amulet-test-fixes
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 470
Merged at revision: 470
Proposed branch: lp:~cjohnston/uci-engine/ts-amulet-test-fixes
Merge into: lp:uci-engine
Prerequisite: lp:~cjohnston/uci-engine/amulet-int-test-fix
Diff against target: 32 lines (+4/-4)
1 file modified
tests/test_ticket_system.py (+4/-4)
To merge this branch: bzr merge lp:~cjohnston/uci-engine/ts-amulet-test-fixes
Reviewer Review Type Date Requested Status
Evan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Chris Johnston (community) Needs Resubmitting
Review via email: mp+218323@code.launchpad.net

Commit message

Fix ticket system amulet tests

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:468
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/585/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/585/rebuild

review: Approve (continuous-integration)
Revision history for this message
Evan (ev) wrote :

Looks good.

review: Approve
lp:~cjohnston/uci-engine/ts-amulet-test-fixes updated
465. By Vincent Ladeuil

[r=PS Jenkins bot, Evan Dandrea, Vincent Ladeuil] Make deploy.py faster by using sourcecode.py from Launchpad. from Vincent Ladeuil

466. By Celso Providelo

[r=PS Jenkins bot, Chris Johnston, Vincent Ladeuil] Moving common testing infrastructure to ci_utils.testing. from Celso Providelo

467. By Celso Providelo

[r=Francis Ginther, PS Jenkins bot] Implementing SourcePackageUpload validation in Gatekeeper. from Celso Providelo

468. By Celso Providelo

[r=Evan Dandrea, PS Jenkins bot, Chris Johnston] Automatically setting HP_* variables (only needed for tempurls in HPCloud) from Celso Providelo

469. By Chris Johnston

[r=PS Jenkins bot, Vincent Ladeuil] Fixes integration amulet tests from Chris Johnston

470. By Chris Johnston

Merge trunk

Revision history for this message
Chris Johnston (cjohnston) :
review: Needs Resubmitting
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:470
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/610/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/610/rebuild

review: Approve (continuous-integration)
Revision history for this message
Evan (ev) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_ticket_system.py'
2--- tests/test_ticket_system.py 2014-04-16 18:36:03 +0000
3+++ tests/test_ticket_system.py 2014-05-07 18:18:52 +0000
4@@ -28,7 +28,7 @@
5 deployer_cfg = 'ticket-system.yaml'
6
7 def get_server_status_and_content(self, url):
8- final_url = url.format(*self.get_ip_and_port('ts-django'))
9+ final_url = url.format(self.get_ip_and_port('webui-apache')[0])
10
11 # Issue a simple command against the ticket API
12 client = httplib2.Http()
13@@ -37,8 +37,8 @@
14 return resp, jcontent
15
16 def create_ticket(self, ticket_content):
17- url = 'http://{}:{}/api/v1/ticket/'
18- final_url = url.format(*self.get_ip_and_port('ts-django'))
19+ url = 'http://{}/api/v1/ticket/'
20+ final_url = url.format(self.get_ip_and_port('webui-apache')[0])
21
22 client = httplib2.Http()
23 resp, content = client.request(
24@@ -50,7 +50,7 @@
25 return resp, content
26
27 def test_ticket_sys_api(self):
28- url = 'http://{}:{}/api/v1/ticket'
29+ url = 'http://{}/api/v1/ticket'
30 resp, content = self.get_server_status_and_content(url)
31
32 self.assertEqual('200', resp['status'])

Subscribers

People subscribed via source and target branches