From 9027741ac57beeb9b80ecb0ab4602ea2af6025da Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 2 Nov 2015 09:35:20 +0000
Subject: [PATCH 1/2] Add tox support

---
 .bzrignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index 421e2bda..9ad1b67f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,3 +1,5 @@
 bin
 .coverage
+.testrepository
+.tox
 tags

From 2f368ff4c580c0c34253c2ded09faf318776cd74 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 2 Nov 2015 09:35:30 +0000
Subject: [PATCH 2/2] Add tox support really

---
 .testr.conf           |  8 ++++++++
 requirements.txt      | 11 +++++++++++
 test-requirements.txt |  8 ++++++++
 tox.ini               | 29 +++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 .testr.conf
 create mode 100644 requirements.txt
 create mode 100644 test-requirements.txt
 create mode 100644 tox.ini

diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 00000000..801646bb
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,8 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
+
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..426002dc
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,11 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+PyYAML>=3.1.0
+simplejson>=2.2.0
+netifaces>=0.10.4
+netaddr>=0.7.12,!=0.7.16
+Jinja2>=2.6  # BSD License (3 clause)
+six>=1.9.0
+dnspython>=1.12.0
+psutil>=1.1.1,<2.0.0
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..3af44d73
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+coverage>=3.6
+mock>=1.2
+flake8>=2.2.4,<=2.4.1
+os-testr>=0.4.1
+charm-tools
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..a79b65dc
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,29 @@
+[tox]
+envlist = lint,py27
+skipsdist = True
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
+install_command =
+  pip install --allow-unverified python-apt {opts} {packages}
+commands = ostestr {posargs}
+
+[testenv:py27]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
+[testenv:lint]
+basepython = python2.7
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = flake8 {posargs} hooks unit_tests tests actions
+           charm proof
+
+[testenv:venv]
+commands = {posargs}
+
+[flake8]
+ignore = E402,E226
+exclude = hooks/charmhelpers