openstack/charm-cinder
Code Issues Proposed changes

auto Makefile test target (amulet): bump juju test timeout to 2700s (same value as the juju-deployer default). Also remove explicit test names, which will cause all +x files in ./tests to be executed (as bundletester does by default).

Browse Source
This commit is contained in:
Ryan Beisner 2015-04-16 21:32:02 +00:00
parent 5245768208
commit fb5d97b723
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -13,10 +13,7 @@ test:
@echo Starting amulet deployment tests... @echo Starting amulet deployment tests...
#NOTE(beisner): can remove -v after bug 1320357 is fixed #NOTE(beisner): can remove -v after bug 1320357 is fixed
# https://bugs.launchpad.net/amulet/+bug/1320357 # https://bugs.launchpad.net/amulet/+bug/1320357
@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 900 \ @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \
16-basic-trusty-icehouse-git 17-basic-trusty-juno \
18-basic-trusty-juno-git
bin/charm_helpers_sync.py: bin/charm_helpers_sync.py:
@mkdir -p bin @mkdir -p bin