From bcfc84f0891e22af56e9db57e381ef2a1bcb95c2 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Thu, 16 Apr 2015 21:32:02 +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 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3b5f23fd..a63bc272 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,7 @@ test:
 	@echo Starting amulet deployment tests...
 	#NOTE(beisner): can remove -v after bug 1320357 is fixed
 	#   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-icehouse-git 17-basic-trusty-juno \
-        18-basic-trusty-juno-git
+	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin