summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-15 06:18:22 -0400
committerChris McDonough <chrism@plope.com>2011-08-15 06:18:22 -0400
commitbeb87d104dd69c8363bd87f64e81e1bcc087375c (patch)
treec1b69716b1a8aa10ab6a8b34fde07aa83d8d9b7b
parent5bf23fad3e0c9a949e8b01ab68991633af2d6df7 (diff)
downloadpyramid-beb87d104dd69c8363bd87f64e81e1bcc087375c.tar.gz
pyramid-beb87d104dd69c8363bd87f64e81e1bcc087375c.tar.bz2
pyramid-beb87d104dd69c8363bd87f64e81e1bcc087375c.zip
appease setup.py test
-rw-r--r--pyramid/tests/test_config.py5
-rw-r--r--setup.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/pyramid/tests/test_config.py b/pyramid/tests/test_config.py
new file mode 100644
index 000000000..c8fae18e7
--- /dev/null
+++ b/pyramid/tests/test_config.py
@@ -0,0 +1,5 @@
+# XXX fix this; nosetests works but setup.py test freaks when
+# trying to use the root as a test_suite
+from pyramid.config.tests.test_config import *
+from pyramid.config.tests.test_views import *
+from pyramid.config.tests.test_util import *
diff --git a/setup.py b/setup.py
index df73e788b..4c556dbc3 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(name='pyramid',
zip_safe=False,
install_requires = install_requires,
tests_require = tests_require,
- test_suite="pyramid",
+ test_suite="pyramid.tests",
entry_points = """\
[paste.paster_create_template]
pyramid_starter=pyramid.scaffolds:StarterProjectTemplate