From 7a1a1a0c38b1f8f7f43d15bf0c91fd7a895d1e8d Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Thu, 16 Apr 2015 21:31:59 +0000 Subject: [PATCH] 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). --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c432b58..d795d78 100644 --- a/Makefile +++ b/Makefile @@ -22,9 +22,7 @@ test: # coreycb note: The -v should only be temporary until Amulet sends # raise_status() messages to stderr: # https://bugs.launchpad.net/amulet/+bug/1320357 - @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 900 \ - 00-setup 14-basic-precise-icehouse 15-basic-trusty-icehouse \ - 16-basic-trusty-juno + @juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700 publish: lint unit_test bzr push lp:charms/ceilometer