Simplify test discovery using unittest discover command

.travis.yml

@@ -3,4 +3,4 @@ python:
   - "2.7"
   - "3.5"
 install: "pip install -r requirements.txt"
-script: "python setup.py test"
+script: "python -m unittest discover"

htmlmin/tests/test_escape.py

@@ -98,6 +98,3 @@ def test_ampersand_nonhex(self):
 
   def test_proper_char_refs(self):
     self.assertNoQuotes('π"4', 'π"4')
-
-def suite():
-  return unittest.TestLoader().loadTestsFromTestCase(TestEscapeAttributes)

htmlmin/tests/tests.py

@@ -586,32 +586,3 @@ def test_middlware_keep_header(self):
         ],
       '    X    Y   ')
     self.assertTrue(any((h == 'X-HTML-Min-Enable' for h, v in headers)))
-
-def suite():
-    minify_function_suite = unittest.TestLoader().\
-        loadTestsFromTestCase(TestMinifyFunction)
-    minifier_object_suite = unittest.TestLoader().\
-        loadTestsFromTestCase(TestMinifierObject)
-    minify_features_suite = unittest.TestLoader().\
-        loadTestsFromTestCase(TestMinifyFeatures)
-    self_closing_tags_suite = unittest.TestLoader().\
-        loadTestsFromTestCase(TestSelfClosingTags)
-    self_opening_tags_suite = unittest.TestLoader().\
-        loadTestsFromTestCase(TestSelfOpeningTags)
-    decorator_suite = unittest.TestLoader().\
-        loadTestsFromTestCase(TestDecorator)
-    middleware_suite = unittest.TestLoader().\
-        loadTestsFromTestCase(TestMiddleware)
-    return unittest.TestSuite([
-        minify_function_suite,
-        minifier_object_suite,
-        minify_features_suite,
-        self_closing_tags_suite,
-        self_opening_tags_suite,
-        decorator_suite,
-        middleware_suite,
-        test_escape.suite(),
-        ])
-
-if __name__ == '__main__':
-  unittest.main()

setup.py

@@ -21,9 +21,7 @@
     packages=find_packages(),
     include_package_data=True,
     zip_safe=True,
-    test_suite='htmlmin.tests.tests.suite',
     install_requires=[],
-    tests_require=[],
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",

tox.ini

@@ -2,4 +2,4 @@
 envlist=py27, py33, py34
 
 [testenv]
-commands=python setup.py test
+commands=python -m unittest discover