From e12300885113b41be21b0c084e4092e87dae1d8d Mon Sep 17 00:00:00 2001
From: Honza Kral <honza.kral@gmail.com>
Date: Mon, 2 Sep 2013 20:57:59 -0500
Subject: [PATCH] Added tox.ini to runtests on multiple python envs

Also updated python setup.py test to run in CI configuration
---
 .gitignore                      | 4 ++++
 setup.py                        | 2 ++
 test_elasticsearch/run_tests.py | 4 ++--
 tox.ini                         | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index f3ba17c8..e84aa04c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@
 test_elasticsearch/cover
 docs/_build
 elasticsearch.egg-info
+.tox
+*.egg
+coverage.xml
+nosetests.xml
diff --git a/setup.py b/setup.py
index 4199f81a..2d16db1d 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,8 @@ tests_require = [
     'nose',
     'coverage',
     'mock',
+    'pyaml',
+    'nosexcover'
 ]
 
 # use external unittest for 2.6
diff --git a/test_elasticsearch/run_tests.py b/test_elasticsearch/run_tests.py
index 2cd2384e..a45ca7a9 100755
--- a/test_elasticsearch/run_tests.py
+++ b/test_elasticsearch/run_tests.py
@@ -9,8 +9,8 @@ def run_all(argv=None):
     # always insert coverage when running tests
     if argv is None:
         argv = [
-            'nosetests',
-            '--with-coverage', '--cover-package=elasticsearch', '--cover-erase',
+            'nosetests', '--with-xunit',
+            '--with-xcoverage', '--cover-package=elasticsearch', '--cover-erase',
             '--nocapture', '--nologcapture',
             '--verbose',
         ]
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..4b2d27ed
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,4 @@
+[tox]
+envlist = py26,py27,py33,pypy
+[testenv]
+commands = python setup.py test