From 131ce117a979f6d592bd9e6c7a70016208040698 Mon Sep 17 00:00:00 2001
From: Rory Finnegan <rory.finnegan@gmail.com>
Date: Tue, 14 Apr 2015 15:07:31 -0400
Subject: [PATCH] Updated the tox.ini file to run multiple ansible versions.

Purpose: so that devs can use tox to run v1 or v2 of ansible with various versions of python.
For example `tox -e py27-v2 will run python2.7 on v2. Currently, only py26 and py27 are run on v1 when
running just `tox` so that we aren't breaking builds.
---
 tox.ini | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 7c86e7e08f1..5691980b607 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,21 @@
 [tox]
-envlist = py26,py27
+envlist = {py26,py27}-v{1}
 
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt
 whitelist_externals = make
+
+[testenv:py26-v1]
 commands = make tests
+
+[testenv:py27-v1]
+commands = make tests
+
+[testenv:py26-v2]
+commands = make newtests
+
+[testenv:py27-v2]
+commands = make newtests
+
+[testenv:py34-v2]
+commands = make newtests