Ubuntu CI Services

Merge lp:~cjohnston/ubuntu-ci-services-itself/fix-amulet-tests into lp:ubuntu-ci-services-itself

  1. fix-amulet-tests
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Francis Ginther
Approved revision: 276
Merged at revision: 277
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/fix-amulet-tests
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 13 lines (+2/-2)
1 file modified
tests/deployers.py (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/fix-amulet-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andy Doan (community) Approve
Francis Ginther Approve
Review via email: mp+208427@code.launchpad.net

Commit message

Fixes issue where paths are being combined

Description of the change

======================================================================
ERROR: test_ticket_sys_api (__main__.TicketSystemTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/jenkins/workspace/uci-engine-integration-tests/ubuntu-ci-services-itself/tests/deployers.py", line 69, in setUp
    self.deployer = AmuletDeployment(self.deployer_cfg)
  File "/home/ubuntu/jenkins/workspace/uci-engine-integration-tests/ubuntu-ci-services-itself/tests/deployers.py", line 37, in __init__
    self.fixup_includes(os.path.dirname(deployer_cfg), jd_script)
  File "/home/ubuntu/jenkins/workspace/uci-engine-integration-tests/ubuntu-ci-services-itself/tests/deployers.py", line 56, in fixup_includes
    with open(path) as f:
IOError: [Errno 20] Not a directory: '/tmp/tmpV6SSqv/deployer/configs/unit_config.yaml/configs/webui_http_vhost'

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

looks good.

review: Approve
Revision history for this message
Andy Doan (doanac) wrote :

who was the idiot that was appending a variable inside a for-loop :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/deployers.py'
2--- tests/deployers.py 2014-02-24 20:09:44 +0000
3+++ tests/deployers.py 2014-02-26 17:02:43 +0000
4@@ -52,8 +52,8 @@
5 include_token = 'include-base64://'
6 if type(val) is str and val.startswith(include_token):
7 val = val.replace(include_token, '')
8- path = os.path.join(path, val)
9- with open(path) as f:
10+ p = os.path.join(path, val)
11+ with open(p) as f:
12 val = base64.b64encode(f.read())
13 service['options'][key] = val
14

Subscribers

People subscribed via source and target branches