Ubuntu CI Services

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

fix-amulet-tests
Merge into trunk

Proposed by Chris Johnston on 2014-02-26

Status:	Merged
Approved by:	Francis Ginther on 2014-02-26
Approved revision:	276
Merged at revision:	277
Proposed branch:	lp://staging/~cjohnston/ubuntu-ci-services-itself/fix-amulet-tests
Merge into:	lp://staging/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://staging/~cjohnston/ubuntu-ci-services-itself/fix-amulet-tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-02-26
Andy Doan (community)			Approve on 2014-02-26
Francis Ginther		2014-02-26	Approve on 2014-02-26
Review via email: mp+208427@code.staging.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'