From 300a4f0b45c4fe47539770899803497790dc8017 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 22 Nov 2014 15:02:52 +0100
Subject: [PATCH] Use tox for tests

---
 .gitignore |  1 +
 README.md  |  2 +-
 setup.py   |  1 +
 tox.ini    | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index ced995972..437c9f0bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 build/
 dist/
 venv/
+.tox/
 m3
diff --git a/README.md b/README.md
index d7264d7e3..87cdf3100 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ conf layout.
 
 #. Bootstrap: `./venv/bin/python setup.py dev`
 
-#. Test code base: `./venv/bin/nosetests`
+#. Test code base: `./venv/bin/tox`
 
 #. Check coding style for the whole project `./venv/bin/pylint letsencrypt`,
    or specific module, e.g. `./venv/bin/pylint letsencrypt.client.acme`.
diff --git a/setup.py b/setup.py
index 2d5bff09c..bb7a03f1b 100755
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,7 @@ testing_extras = [
     'coverage',
     'nose',
     'pylint',
+    'tox>=1.6',
 ]
 
 setup(
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..d4df3e8bf
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,14 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py26, py27
+
+[testenv]
+# install_command requires tox>=1.6
+install_command = pip install --process-dependency-links {opts} {packages}
+commands = nosetests
+deps =
+    nose