From 4cff9c3b75e426c72299cda4e6143e249ee8564f Mon Sep 17 00:00:00 2001
From: David Rousselie <dax@happycoders.org>
Date: Mon, 7 May 2007 17:19:20 +0200
Subject: [PATCH] Include unit testing in setuptools

darcs-hash:20070507151920-86b55-d04acb9709ef754148422e3d7b624415d112375e.gz
---
 run_tests.py | 32 +++++++++++++++++---------------
 setup.py     |  6 ++++--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index 5e270ab..f321d48 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -22,8 +22,6 @@
 ##
 
 import coverage
-coverage.erase()
-coverage.start()
 import logging
 import unittest
 from test import test_support
@@ -43,11 +41,7 @@ import jmc
 import jmc.jabber
 import jmc.jabber.component
 
-if __name__ == '__main__':
-    logger = logging.getLogger()
-    logger.addHandler(logging.StreamHandler())
-    logger.setLevel(logging.INFO)
-    
+def test_suite():
     mail_account_suite = unittest.makeSuite(MailAccount_TestCase, "test")
     imap_account_suite = unittest.makeSuite(IMAPAccount_TestCase, "test")
     pop3_account_suite = unittest.makeSuite(POP3Account_TestCase, "test")
@@ -62,15 +56,23 @@ if __name__ == '__main__':
                                     imap_account_suite, \
                                     pop3_account_suite, \
                                     mail_component_suite))
-    test_support.run_suite(jmc_suite)
+    return jmc_suite
 
+if __name__ == '__main__':
+    logger = logging.getLogger()
+    logger.addHandler(logging.StreamHandler())
+    logger.setLevel(logging.INFO)
+    
+    coverage.erase()
+    coverage.start()
 
-coverage.stop()
-coverage.analysis(jmc.jabber.component)
-coverage.analysis(jmc.lang)
-coverage.analysis(jmc.model.account)
+    unittest.main()    
 
-coverage.report([jmc.jabber.component, \
-                 jmc.lang, \
-                 jmc.model.account])
+    coverage.stop()
+    coverage.analysis(jmc.jabber.component)
+    coverage.analysis(jmc.lang)
+    coverage.analysis(jmc.model.account)
 
+    coverage.report([jmc.jabber.component, \
+                     jmc.lang, \
+                     jmc.model.account])
diff --git a/setup.py b/setup.py
index 53c9220..c786fef 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
 
-from distutils.core import setup
+from setuptools import setup
 
 setup(name = 'jmc', \
       version = '0.3', \
@@ -29,4 +29,6 @@ setup(name = 'jmc', \
       author_email = 'dax@happycoders.org', \
       url = 'http://people.happycoders.org/dax/projects/jmc', \
       package_dir = {'': 'src'}, \
-      packages = ['jmc', 'jmc.jabber', 'jmc.model'])
+      packages = ['jmc', 'jmc.jabber', 'jmc.model'], \
+      scripts = ['src/jmc.py'], \
+      test_suite = 'run_tests.test_suite')