Merge lp:~1chb1n/charms/trusty/swift-storage/next-amulet-1602 into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[Ryan Beisner]

Update amulet test targets

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

charm_unit_test #378 swift-storage-next for 1chb1n mp285959
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/378/

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

charm_lint_check #459 swift-storage-next for 1chb1n mp285959
    LINT OK: passed

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

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

charm_amulet_test #176 swift-storage-next for 1chb1n mp285959
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15033695/
Build: http://10.245.162.36:8080/job/charm_amulet_test/176/

[lp:~1chb1n/charms/trusty/swift-storage/next-amulet-1602]

106. By Ryan Beisner on 2016-02-13

Update amulet targets

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

charm_lint_check #461 swift-storage-next for 1chb1n mp285959
    LINT OK: passed

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

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

charm_unit_test #381 swift-storage-next for 1chb1n mp285959
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/381/

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

charm_amulet_test #179 swift-storage-next for 1chb1n mp285959
    AMULET OK: passed

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

=== modified file 'tests/018-basic-trusty-liberty' (properties changed: -x to +x)
=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
=== modified file 'tests/020-basic-wily-liberty' (properties changed: -x to +x)
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-10-12 12:29:59 +0000
+++ tests/basic_deployment.py	2016-02-13 03:45:27 +0000
@@ -1,5 +1,3 @@
-import time
-
 import amulet
 import swiftclient
 
@@ -27,6 +25,13 @@
         self._add_relations()
         self._configure_services()
         self._deploy()
+
+        u.log.info('Waiting on extended status checks...')
+        exclude_services = ['mysql']
+
+        # Wait for deployment ready msgs, except exclusions
+        self._auto_wait_for_status(exclude_services=exclude_services)
+
         self._initialize_tests()
 
     def _add_services(self):
@@ -85,9 +90,6 @@
         u.log.debug('openstack release str: {}'.format(
             self._get_openstack_release_string()))
 
-        # Let things settle a bit before moving forward
-        time.sleep(30)
-
         # Authenticate admin with keystone
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',