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

[Ryan Beisner]

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

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

charm_lint_check #387 ceph-next for 1chb1n mp285940
    LINT OK: passed

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

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

charm_unit_test #308 ceph-next for 1chb1n mp285940
    UNIT OK: passed

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

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

134. By Ryan Beisner on 2016-02-12

No need to not wait for nonexistent nrpe

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

charm_unit_test #309 ceph-next for 1chb1n mp285940
    UNIT OK: passed

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

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

charm_lint_check #389 ceph-next for 1chb1n mp285940
    LINT OK: passed

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

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

charm_amulet_test #158 ceph-next for 1chb1n mp285940
    AMULET OK: passed

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

=== 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-07-02 14:38:21 +0000
+++ tests/basic_deployment.py	2016-02-12 21:24:32 +0000
@@ -26,6 +26,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):
@@ -104,9 +111,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',