From a49f74bc112cdc2caa4f771dfe75e0294c98ee35 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 15 Jul 2013 13:54:00 -0400
Subject: [PATCH] Make testr tests run properly

---
 .gitignore  | 1 +
 .testr.conf | 9 +++++++++
 tox.ini     | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 .testr.conf

diff --git a/.gitignore b/.gitignore
index 39a14113..5d1dac97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ storyboard.db
 AUTHORS
 ChangeLog
 *.egg-info
+.testrepository
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 00000000..5ec63d8c
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             DJANGO_SETTINGS_MODULE=storyboard.settings \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION
+
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/tox.ini b/tox.ini
index 4b66eff8..6a9e2fb3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ setenv = VIRTUAL_ENV={envdir}
          LANG=en_US.UTF-8
          LANGUAGE=en_US:en
          LC_ALL=C
+         DJANGO_SETTINGS_MODULE=storyboard.settings
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt