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

[Ryan Beisner]

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

[lp:~1chb1n/charms/trusty/ubuntu/amulet-update-1602]

15. By Ryan Beisner on 2016-02-12

Update

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

=== removed file 'tests/025_basic_vivid'
--- tests/025_basic_vivid	2015-04-29 15:28:48 +0000
+++ tests/025_basic_vivid	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/usr/bin/python
-"""Amulet tests on a basic ubuntu charm deployment on trusty."""
-
-from basic_deployment import ubuntu_basic_deployment
-
-if __name__ == '__main__':
-    ubuntu_basic_deployment(series='vivid')

=== renamed file 'tests/030_basic_wily' => 'tests/025_basic_wily'
=== added file 'tests/030_basic_xenial'
--- tests/030_basic_xenial	1970-01-01 00:00:00 +0000
+++ tests/030_basic_xenial	2016-02-12 22:06:33 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/python
+"""Amulet tests on a basic ubuntu charm deployment on xenial."""
+
+from basic_deployment import ubuntu_basic_deployment
+
+if __name__ == '__main__':
+    ubuntu_basic_deployment(series='xenial')

=== added directory 'tests/setup'
=== renamed file 'tests/00-setup.sh' => 'tests/setup/00-setup.sh'