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

Proposed by Ryan Beisner
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 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.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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
=== 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 @@
1import time
2
3import amulet1import amulet
4import swiftclient2import swiftclient
53
@@ -27,6 +25,13 @@
27 self._add_relations()25 self._add_relations()
28 self._configure_services()26 self._configure_services()
29 self._deploy()27 self._deploy()
28
29 u.log.info('Waiting on extended status checks...')
30 exclude_services = ['mysql']
31
32 # Wait for deployment ready msgs, except exclusions
33 self._auto_wait_for_status(exclude_services=exclude_services)
34
30 self._initialize_tests()35 self._initialize_tests()
3136
32 def _add_services(self):37 def _add_services(self):
@@ -85,9 +90,6 @@
85 u.log.debug('openstack release str: {}'.format(90 u.log.debug('openstack release str: {}'.format(
86 self._get_openstack_release_string()))91 self._get_openstack_release_string()))
8792
88 # Let things settle a bit before moving forward
89 time.sleep(30)
90
91 # Authenticate admin with keystone93 # Authenticate admin with keystone
92 self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,94 self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
93 user='admin',95 user='admin',

Subscribers

People subscribed via source and target branches