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

[Ryan Beisner]

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

...

FYI - The remaining test targets are not yet enabled here because:

# haproxy not listening on *-Mitaka
https://bugs.launchpad.net/charms/+source/openstack-dashboard/+bug/1545217

# apache2 not listening on Wily-Liberty
https://bugs.launchpad.net/charms/+source/openstack-dashboard/+bug/1546209

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

charm_lint_check #456 openstack-dashboard-next for 1chb1n mp285955
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/15032322/
Build: http://10.245.162.36:8080/job/charm_lint_check/456/

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

charm_unit_test #376 openstack-dashboard-next for 1chb1n mp285955
    UNIT OK: passed

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

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

charm_amulet_test #173 openstack-dashboard-next for 1chb1n mp285955
    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/15033326/
Build: http://10.245.162.36:8080/job/charm_amulet_test/173/

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

105. By Ryan Beisner on 2016-02-13

Disable Mitaka re: lp1545217

106. By Ryan Beisner on 2016-02-13

Fix lint

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

charm_lint_check #457 openstack-dashboard-next for 1chb1n mp285955
    LINT OK: passed

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

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

charm_unit_test #377 openstack-dashboard-next for 1chb1n mp285955
    UNIT OK: passed

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

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

charm_amulet_test #174 openstack-dashboard-next for 1chb1n mp285955
    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/15033887/
Build: http://10.245.162.36:8080/job/charm_amulet_test/174/

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

107. By Ryan Beisner on 2016-02-16

Disable Wily test re: bug 1545217

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

charm_lint_check #658 openstack-dashboard-next for 1chb1n mp285955
    LINT OK: passed

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

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

charm_unit_test #568 openstack-dashboard-next for 1chb1n mp285955
    UNIT OK: passed

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

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

charm_amulet_test #265 openstack-dashboard-next for 1chb1n mp285955
    AMULET OK: passed

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

[David Ames (thedac)]

Looks good. Merging.

review: Approve

=== modified file 'tests/018-basic-trusty-liberty' (properties changed: -x to +x)
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-09-12 10:58:20 +0000
+++ tests/basic_deployment.py	2016-02-16 17:12:43 +0000
@@ -2,7 +2,6 @@
 
 import amulet
 import os
-import time
 import urllib2
 import yaml
 
@@ -35,6 +34,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):
@@ -139,8 +145,6 @@
             self._get_openstack_release()))
         u.log.debug('openstack release str: {}'.format(
             self._get_openstack_release_string()))
-        # Let things settle a bit before moving forward
-        time.sleep(30)
 
     # NOTE(beisner): Switch to helper once the rabbitmq test refactor lands.
     def crude_py_parse(self, file_contents, expected):