From e34c77df2fb81722e4921d907b66f9cb42a73aa8 Mon Sep 17 00:00:00 2001
From: Ryan Beisner <ryan.beisner@canonical.com>
Date: Fri, 8 Jan 2016 21:44:54 +0000
Subject: [PATCH] Move 00-setup to prevent extra, unnecessary bootstrap in test
 runs.

---
 Makefile                   | 1 +
 tests/{ => setup}/00-setup | 0
 2 files changed, 1 insertion(+)
 rename tests/{ => setup}/00-setup (100%)

diff --git a/Makefile b/Makefile
index 713e37c..aecf043 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ test:
 
 functional_test:
 	@echo Starting all functional, lint and unit tests...
+	@tests/setup/00-setup
 	@juju test -v -p AMULET_HTTP_PROXY --timeout 2700
 
 bin/charm_helpers_sync.py:
diff --git a/tests/00-setup b/tests/setup/00-setup
similarity index 100%
rename from tests/00-setup
rename to tests/setup/00-setup