Juju Charms Collection
hacluster package

Merge lp:~1chb1n/charms/trusty/hacluster/next1507-amulet-cleanup into lp:~openstack-charmers/charms/trusty/hacluster/next

  1. Trusty Tahr (14.04)
  2. next1507-amulet-cleanup
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 52
Proposed branch: lp:~1chb1n/charms/trusty/hacluster/next1507-amulet-cleanup
Merge into: lp:~openstack-charmers/charms/trusty/hacluster/next
Diff against target: 1 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/hacluster/next1507-amulet-cleanup
Reviewer Review Type Date Requested Status
Billy Olsen Approve
charmers Pending
Review via email: mp+266298@code.launchpad.net

This proposal supersedes a proposal from 2015-07-29.

Description of the change

The shared test library file (basic_deployment.py) should not be +x executable. FWIW, just caught that as part of the 15.07 syntax/check sweet on amulet test files.

Logic: bundletester and `juju test` will attempt to execute anything that is +x in the tests/ dir.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7191 hacluster-next for 1chb1n mp266298
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7191/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #6656 hacluster-next for 1chb1n mp266298
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/6656/

Revision history for this message
Billy Olsen (billy-olsen) wrote :

Yeah, probably want a -x on it so amulet doesn't try and run it. Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/basic_deployment.py' (properties changed: +x to -x)

Subscribers

People subscribed via source and target branches