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

[Ryan Beisner]

Update amulet test definitions; Wait for workload status before testing.

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

charm_lint_check #388 ceph-osd-next for 1chb1n mp285942
    LINT OK: passed

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

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

charm_unit_test #310 ceph-osd-next for 1chb1n mp285942
    UNIT OK: passed

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

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

charm_amulet_test #159 ceph-osd-next for 1chb1n mp285942
    AMULET OK: passed

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

=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-06-29 21:20:01 +0000
+++ tests/basic_deployment.py	2016-02-12 21:25:45 +0000
@@ -27,6 +27,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):
@@ -114,9 +121,6 @@
         u.log.debug('openstack release str: {}'.format(
             self._get_openstack_release_string()))
 
-        # Let things settle a bit original moving forward
-        time.sleep(30)
-
         # Authenticate admin with keystone
         self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
                                                       user='admin',