Merge pull request #14 from vinta/feature/setup-py-test

feature/setup-py-test

.travis.yml

@@ -12,7 +12,7 @@ install:
   - pip install -r requirements_test.txt --use-mirrors
 
 script:
-  - coverage run --source=haul tests/test.py
+  - coverage run --source=haul setup.py test
 
 notifications:
   email:

HISTORY.rst

@@ -5,6 +5,7 @@ History
 ++++++++++++++++++
 
 - Bug fixed: `#12 <https://github.com/vinta/Haul/issues/12>`_
+- Support running tests with `python setup.py test`
 
 
 1.3.1 (2013-10-24)

README.rst

@@ -149,5 +149,4 @@ Run Tests
 
 .. code-block:: bash
 
-    $ cd tests
-    $ python test.py
+    $ python setup.py test

haul/utils.py

@@ -1,15 +1,9 @@
 # coding: utf-8
 
 import cStringIO
-import pprint
 import sys
 
 
-def pp(something):
-    printer = pprint.PrettyPrinter(indent=2)
-    printer.pprint(something)
-
-
 def import_module(name):
     __import__(name)
 

requirements_test.txt

@@ -1,3 +1,2 @@
 -r requirements.txt
-coverage==3.7
-coveralls==0.3
+coveralls

setup.py

@@ -41,6 +41,7 @@
     install_requires=install_requires,
     include_package_data=True,
     packages=packages,
+    test_suite='tests',
     zip_safe=False,
     classifiers=(
         'Development Status :: 3 - Alpha',

tests/test.py

@@ -1,15 +1,13 @@
 # coding: utf-8
 
 import os
-import sys
-HAUL_ROOT = os.path.abspath(os.path.join(__file__, '../../'))
-TESTS_DIR = os.path.abspath(os.path.join(__file__, '../'))
-sys.path.insert(0, HAUL_ROOT)
-
 import unittest
 
 from haul import Haul, HaulResult, exceptions
-from haul.utils import pp, read_file
+from haul.utils import read_file
+
+
+TESTS_DIR = os.path.abspath(os.path.join(__file__, '../'))
 
 
 class HaulBaseTestCase(unittest.TestCase):
@@ -244,5 +242,4 @@ def test_content_type_not_supported(self):
 
 
 if __name__ == '__main__':
-    print('testing Haul')
     unittest.main()