From 4f6fa981ec9035b2708ba0dc9db21d5dd629f389 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 26 Aug 2015 12:45:29 +0100
Subject: [PATCH 1/3] Make 'setup.py test' run tox

---
 setup.cfg |  3 ---
 setup.py  | 27 ++++++++++++++++++++++++++-
 tox.ini   |  2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index abb649958..ba027c7d1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,9 +3,6 @@ source-dir = docs/sphinx
 build-dir  = docs/build
 all_files  = 1
 
-[aliases]
-test = trial
-
 [trial]
 test_suite = tests
 
diff --git a/setup.py b/setup.py
index 8ad20df7c..adc331692 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,8 @@
 
 import glob
 import os
-from setuptools import setup, find_packages
+from setuptools import setup, find_packages, Command
+import sys
 
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -37,6 +38,28 @@ def exec_file(path_segments):
     exec(code, result)
     return result
 
+
+class Tox(Command):
+    user_options = [('tox-args=', 'a', "Arguments to pass to tox")]
+
+    def initialize_options(self):
+        self.tox_args = None
+
+    def finalize_options(self):
+        self.test_args = []
+        self.test_suite = True
+
+    def run(self):
+        #import here, cause outside the eggs aren't loaded
+        import tox
+        import shlex
+        args = self.tox_args
+        if args:
+            args = shlex.split(self.tox_args)
+        errno = tox.cmdline(args=args)
+        sys.exit(errno)
+
+
 version = exec_file(("synapse", "__init__.py"))["__version__"]
 dependencies = exec_file(("synapse", "python_dependencies.py"))
 long_description = read_file(("README.rst",))
@@ -52,4 +75,6 @@ setup(
     zip_safe=False,
     long_description=long_description,
     scripts=["synctl"] + glob.glob("scripts/*"),
+    tests_require=['tox'],
+    cmdclass={'test': Tox},
 )
diff --git a/tox.ini b/tox.ini
index 370a63cbb..3f0649b62 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ deps =
 setenv =
     PYTHONDONTWRITEBYTECODE = no_byte_code
 commands =
-    coverage run --source=./synapse {envbindir}/trial {posargs:tests}
+    coverage run --source=synapse {envbindir}/trial {posargs:tests}
     coverage report -m
 install_command =
     pip install --process-dependency-links --pre {opts} {packages}

From fd246fde8934f1461589df20efcf53ae1bd0e90d Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 26 Aug 2015 12:59:02 +0100
Subject: [PATCH 2/3] Install tox locally if it wasn't already installed when
 running setup.py test

---
 setup.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index adc331692..4a7b3c99a 100755
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,16 @@ class Tox(Command):
 
     def run(self):
         #import here, cause outside the eggs aren't loaded
-        import tox
+        try:
+            import tox
+        except ImportError:
+            try:
+                self.distribution.fetch_build_eggs("tox")
+                import tox
+            except:
+                raise RuntimeError(
+                    "The tests need 'tox' to run. Please install 'tox'."
+                )
         import shlex
         args = self.tox_args
         if args:
@@ -75,6 +84,5 @@ setup(
     zip_safe=False,
     long_description=long_description,
     scripts=["synctl"] + glob.glob("scripts/*"),
-    tests_require=['tox'],
     cmdclass={'test': Tox},
 )

From 06094591c5397af64a495dce2271da2df5b491b9 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 26 Aug 2015 13:13:01 +0100
Subject: [PATCH 3/3] Pass an empty list of arguments to tox if no arguments
 are given

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

diff --git a/setup.py b/setup.py
index 4a7b3c99a..0e3f2f18d 100755
--- a/setup.py
+++ b/setup.py
@@ -65,6 +65,8 @@ class Tox(Command):
         args = self.tox_args
         if args:
             args = shlex.split(self.tox_args)
+        else:
+            args = []
         errno = tox.cmdline(args=args)
         sys.exit(errno)