Make testr tests run properly

ttx · Jul 15, 2013 · a49f74b · a49f74b
1 parent 8103db2
commit a49f74b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ storyboard.db
 AUTHORS
 ChangeLog
 *.egg-info
+.testrepository
diff --git a/.testr.conf 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
@@ -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