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

Proposed by Ryan Beisner on 2016-02-13
Status: Merged
Merged at revision: 106
Proposed branch: lp:~1chb1n/charms/trusty/swift-storage/next-amulet-1602
Merge into: lp:~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target: 36 lines (+7/-5)
1 file modified
tests/basic_deployment.py (+7/-5)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/swift-storage/next-amulet-1602
Reviewer Review Type Date Requested Status
OpenStack Charmers 2016-02-13 Pending
Review via email: mp+285959@code.launchpad.net

Description of the change

Update amulet test targets

To post a comment you must log in.

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/

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/

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/

106. By Ryan Beisner on 2016-02-13

Update amulet targets

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/

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/

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/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/018-basic-trusty-liberty' (properties changed: -x to +x)
2=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
3=== modified file 'tests/020-basic-wily-liberty' (properties changed: -x to +x)
4=== modified file 'tests/basic_deployment.py'
5--- tests/basic_deployment.py 2015-10-12 12:29:59 +0000
6+++ tests/basic_deployment.py 2016-02-13 03:45:27 +0000
7@@ -1,5 +1,3 @@
8-import time
9-
10 import amulet
11 import swiftclient
12
13@@ -27,6 +25,13 @@
14 self._add_relations()
15 self._configure_services()
16 self._deploy()
17+
18+ u.log.info('Waiting on extended status checks...')
19+ exclude_services = ['mysql']
20+
21+ # Wait for deployment ready msgs, except exclusions
22+ self._auto_wait_for_status(exclude_services=exclude_services)
23+
24 self._initialize_tests()
25
26 def _add_services(self):
27@@ -85,9 +90,6 @@
28 u.log.debug('openstack release str: {}'.format(
29 self._get_openstack_release_string()))
30
31- # Let things settle a bit before moving forward
32- time.sleep(30)
33-
34 # Authenticate admin with keystone
35 self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
36 user='admin',

Subscribers

People subscribed via source and target branches