From 534ea3b3905386a1cbe18ea39063ec037d6185c3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 27 Mar 2013 18:31:02 +0530
Subject: [PATCH] Nicer test invocation

---
 src/calibre/db/tests/filesystem.py | 11 -----------
 src/calibre/db/tests/main.py       | 10 ++++++++--
 src/calibre/db/tests/reading.py    | 11 +----------
 src/calibre/db/tests/writing.py    | 13 -------------
 4 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/calibre/db/tests/filesystem.py b/src/calibre/db/tests/filesystem.py
index d5ac84014b..93f4891ac0 100644
--- a/src/calibre/db/tests/filesystem.py
+++ b/src/calibre/db/tests/filesystem.py
@@ -74,14 +74,3 @@ class FilesystemTest(BaseTest):
         self.assertNotEqual(cache.field_for('title', 1), 'Moved', 'Title was changed despite file lock')
 
 
-def tests():
-    tl = unittest.TestLoader()
-    return tl.loadTestsFromTestCase(FilesystemTest)
-
-def run():
-    unittest.TextTestRunner(verbosity=2).run(tests())
-
-if __name__ == '__main__':
-    run()
-
-
diff --git a/src/calibre/db/tests/main.py b/src/calibre/db/tests/main.py
index 82a5a53f69..c4bb058b7e 100644
--- a/src/calibre/db/tests/main.py
+++ b/src/calibre/db/tests/main.py
@@ -7,11 +7,17 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import unittest, os
+import unittest, os, argparse
 
 def find_tests():
     return unittest.defaultTestLoader.discover(os.path.dirname(os.path.abspath(__file__)), pattern='*.py')
 
 if __name__ == '__main__':
-    unittest.TextTestRunner(verbosity=2).run(find_tests())
+    parser = argparse.ArgumentParser()
+    parser.add_argument('name', nargs='?', default=None, help='The name of the test to run, for e.g. writing.WritingTest.many_many_basic')
+    args = parser.parse_args()
+    if args.name:
+        unittest.TextTestRunner(verbosity=4).run(unittest.defaultTestLoader.loadTestsFromName(args.name))
+    else:
+        unittest.TextTestRunner(verbosity=4).run(find_tests())
 
diff --git a/src/calibre/db/tests/reading.py b/src/calibre/db/tests/reading.py
index 788700f047..bf691a3b03 100644
--- a/src/calibre/db/tests/reading.py
+++ b/src/calibre/db/tests/reading.py
@@ -7,7 +7,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import unittest, datetime
+import datetime
 
 from calibre.utils.date import utc_tz
 from calibre.db.tests.base import BaseTest
@@ -335,12 +335,3 @@ class ReadingTest(BaseTest):
 
     # }}}
 
-def tests():
-    return unittest.TestLoader().loadTestsFromTestCase(ReadingTest)
-
-def run():
-    unittest.TextTestRunner(verbosity=2).run(tests())
-
-if __name__ == '__main__':
-    run()
-
diff --git a/src/calibre/db/tests/writing.py b/src/calibre/db/tests/writing.py
index db460eec7a..127bcd3609 100644
--- a/src/calibre/db/tests/writing.py
+++ b/src/calibre/db/tests/writing.py
@@ -7,7 +7,6 @@ __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import unittest
 from collections import namedtuple
 from functools import partial
 
@@ -293,15 +292,3 @@ class WritingTest(BaseTest):
 
     # }}}
 
-def tests():
-    tl = unittest.TestLoader()
-    # return tl.loadTestsFromName('writing.WritingTest.test_many_many_basic')
-    return tl.loadTestsFromTestCase(WritingTest)
-
-def run():
-    unittest.TextTestRunner(verbosity=2).run(tests())
-
-if __name__ == '__main__':
-    run()
-
-