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).

This commit is contained in:
Ryan Beisner 2015-04-16 21:32:03 +00:00
parent 0a0a9d88e6
commit c3f22f8e7c

View File

@ -23,10 +23,7 @@ test:
# coreycb note: The -v should only be temporary until Amulet sends # coreycb note: The -v should only be temporary until Amulet sends
# raise_status() messages to stderr: # raise_status() messages to stderr:
# 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
publish: lint unit_test publish: lint unit_test
bzr push lp:charms/neutron-api bzr push lp:charms/neutron-api