Merge lp:~1chb1n/charms/trusty/ubuntu/amulet-update-1602 into lp:charms/trusty/ubuntu

Proposed by Ryan Beisner on 2016-02-12
Status: Merged
Merged at revision: 14
Proposed branch: lp:~1chb1n/charms/trusty/ubuntu/amulet-update-1602
Merge into: lp:charms/trusty/ubuntu
Diff against target: 27 lines (+7/-7)
2 files modified
tests/025_basic_vivid (+0/-7)
tests/030_basic_xenial (+7/-0)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/ubuntu/amulet-update-1602
Reviewer Review Type Date Requested Status
charmers 2016-02-12 Pending
Review via email: mp+285946@code.launchpad.net

Description of the change

Amulet test update: Remove EOL Vivid; Add Xenial; Move 00-setup to prevent unnecessary extra bootstrap.

To post a comment you must log in.
15. By Ryan Beisner on 2016-02-12

Update

charm_lint_check #392 ubuntu for 1chb1n mp285946
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/392/

charm_amulet_test #163 ubuntu for 1chb1n mp285946
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/163/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'tests/025_basic_vivid'
2--- tests/025_basic_vivid 2015-04-29 15:28:48 +0000
3+++ tests/025_basic_vivid 1970-01-01 00:00:00 +0000
4@@ -1,7 +0,0 @@
5-#!/usr/bin/python
6-"""Amulet tests on a basic ubuntu charm deployment on trusty."""
7-
8-from basic_deployment import ubuntu_basic_deployment
9-
10-if __name__ == '__main__':
11- ubuntu_basic_deployment(series='vivid')
12
13=== renamed file 'tests/030_basic_wily' => 'tests/025_basic_wily'
14=== added file 'tests/030_basic_xenial'
15--- tests/030_basic_xenial 1970-01-01 00:00:00 +0000
16+++ tests/030_basic_xenial 2016-02-12 22:06:33 +0000
17@@ -0,0 +1,7 @@
18+#!/usr/bin/python
19+"""Amulet tests on a basic ubuntu charm deployment on xenial."""
20+
21+from basic_deployment import ubuntu_basic_deployment
22+
23+if __name__ == '__main__':
24+ ubuntu_basic_deployment(series='xenial')
25
26=== added directory 'tests/setup'
27=== renamed file 'tests/00-setup.sh' => 'tests/setup/00-setup.sh'

Subscribers

People subscribed via source and target branches

to all changes: