Skip to content
Snippets Groups Projects
Commit ee4d1de33fc8 authored by Bob Ippolito's avatar Bob Ippolito
Browse files

punting on nosetests support, python setup.py test works as does python...

punting on nosetests support, python setup.py test works as does python -msimplejson.tests http://code.google.com/p/simplejson/issues/detail?id=55

git-svn-id: http://simplejson.googlecode.com/svn/trunk@191 a4795897-2c25-0410-b006-0d3caba88fa1
parent 3732e4b58182
Branches
No related tags found
No related merge requests found
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
license="MIT License", license="MIT License",
packages=find_packages(exclude=['ez_setup']), packages=find_packages(exclude=['ez_setup']),
platforms=['any'], platforms=['any'],
test_suite="simplejson.tests", test_suite="simplejson.tests.all_tests_suite",
zip_safe=True, zip_safe=True,
features=features, features=features,
cmdclass={'build_ext': ve_build_ext}, cmdclass={'build_ext': ve_build_ext},
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
return suite return suite
def main(): def all_tests_suite():
suite = unittest.TestLoader().loadTestsFromNames([ suite = unittest.TestLoader().loadTestsFromNames([
'simplejson.tests.test_check_circular', 'simplejson.tests.test_check_circular',
'simplejson.tests.test_decode', 'simplejson.tests.test_decode',
...@@ -44,4 +44,8 @@ ...@@ -44,4 +44,8 @@
'simplejson.tests.test_unicode', 'simplejson.tests.test_unicode',
]) ])
suite = additional_tests(suite) suite = additional_tests(suite)
return OptionalExtensionTestSuite([suite])
def main():
runner = unittest.TextTestRunner() runner = unittest.TextTestRunner()
...@@ -47,5 +51,6 @@ ...@@ -47,5 +51,6 @@
runner = unittest.TextTestRunner() runner = unittest.TextTestRunner()
runner.run(OptionalExtensionTestSuite([suite])) suite = all_tests_suite()
runner.run(suite)
if __name__ == '__main__': if __name__ == '__main__':
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment