summaryrefslogtreecommitdiff
path: root/pystache
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-04-28 10:36:06 -0700
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-04-28 10:36:06 -0700
commitf7f63aea20b9d6528a7c6db66ef710037d4416a5 (patch)
treef4dae4859e7201c22e8724c76b7bb24ad3608f77 /pystache
parent91a2f860b14e481357972c98c4997c18ef37d7d5 (diff)
downloadpystache-f7f63aea20b9d6528a7c6db66ef710037d4416a5.tar.gz
Added back using nose to test a subset of tests.
Diffstat (limited to 'pystache')
-rw-r--r--pystache/commands/test.py2
-rw-r--r--pystache/tests/main.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/pystache/commands/test.py b/pystache/commands/test.py
index aec1ff6..0872453 100644
--- a/pystache/commands/test.py
+++ b/pystache/commands/test.py
@@ -7,7 +7,7 @@ This module provides a command to test pystache (unit tests, doctests, etc).
import sys
-from pystache.tests.main import run_tests
+from pystache.tests.main import main as run_tests
def main(sys_argv=sys.argv):
diff --git a/pystache/tests/main.py b/pystache/tests/main.py
index 7342c91..de56c44 100644
--- a/pystache/tests/main.py
+++ b/pystache/tests/main.py
@@ -24,7 +24,9 @@ from pystache.tests.spectesting import get_spec_tests
FROM_SOURCE_OPTION = "--from-source"
-def run_tests(sys_argv):
+# Do not include "test" in this function's name to avoid it getting
+# picked up by nosetests.
+def main(sys_argv):
"""
Run all tests in the project.