From 8062d82a8421330611f4a277339db3342950180c Mon Sep 17 00:00:00 2001
From: Andrew McLeod <andrew.mcleod@canonical.com>
Date: Wed, 9 Aug 2017 10:01:35 -0600
Subject: [PATCH] Modify tests.yaml which specifies bundletester config params
 with the following key:value pairs:

- reset_timeout: 600

Also remove additional tests.yaml from ./src/

Change-Id: I52157b13b1ce6871f672de56266e5d15405eb599
---
 src/tests.yaml       | 17 -----------------
 src/tests/tests.yaml |  1 +
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 src/tests.yaml

diff --git a/src/tests.yaml b/src/tests.yaml
deleted file mode 100644
index 4cf93d0..0000000
--- a/src/tests.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Bootstrap the model if necessary.
-bootstrap: True
-# Re-use bootstrap node.
-reset: True
-# Use tox/requirements to drive the venv instead of bundletester's venv feature.
-virtualenv: False
-# Leave makefile empty, otherwise unit/lint tests will rerun ahead of amulet.
-makefile: []
-# Do not specify juju PPA sources.  Juju is presumed to be pre-installed
-# and configured in all test runner environments.
-#sources:
-# Do not specify or rely on system packages.
-#packages:
-# Do not specify python packages here.  Use test-requirements.txt
-# and tox instead.  ie. The venv is constructed before bundletester
-# is invoked.
-#python-packages:
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 4cf93d0..a03e7ba 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -15,3 +15,4 @@ makefile: []
 # and tox instead.  ie. The venv is constructed before bundletester
 # is invoked.
 #python-packages:
+reset_timeout: 600