Add code coverage report

darcs-hash:20071212181010-86b55-7b831a663f431b209c9067947579cbe4c50e42a8.gz

6 files changed, 53 insertions, 81 deletions

diff --git a/run_tests.py b/run_tests.py
index 29e2f65..085df7a 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -4,24 +4,27 @@
 ## Login : David Rousselie <dax@happycoders.org>
 ## Started on  Wed Aug  9 21:37:35 2006 David Rousselie
 ## $Id$
-## 
+##
 ## Copyright (C) 2006 David Rousselie
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
 
 import coverage
+coverage.erase()
+coverage.start()
+
 import logging
 import unittest
 from test import test_support
@@ -36,26 +39,34 @@ import jmc
 import jmc.jabber
 import jmc.jabber.component
 
-import jmc.tests as jmc
+import jmc.tests
 
 def suite():
-    return jmc.suite()
+    return jmc.tests.suite()
 
 if __name__ == '__main__':
+    class MyTestProgram(unittest.TestProgram):
+        def runTests(self):
+            """run tests but do not exit after"""
+            if self.testRunner is None:
+                self.testRunner = unittest.TextTestRunner(verbosity=self.verbosity)
+            self.testRunner.run(self.test)
+
     logger = logging.getLogger()
     logger.addHandler(logging.StreamHandler())
     logger.setLevel(logging.CRITICAL)
-    
-    coverage.erase()
-    coverage.start()
-
-    unittest.main(defaultTest='suite')    
 
-    coverage.stop()
-    coverage.analysis(jmc.jabber.component)
-    coverage.analysis(jmc.lang)
-    coverage.analysis(jmc.model.account)
+    MyTestProgram(defaultTest='suite')
 
-    coverage.report([jmc.jabber.component, \
-                         jmc.lang, \
-                         jmc.model.account])
+coverage.report(["src/jmc/__init__.py",
+                 "src/jmc/lang.py",
+                 "src/jmc/runner.py",
+                 "src/jmc/jabber/__init__.py",
+                 "src/jmc/jabber/command.py",
+                 "src/jmc/jabber/component.py",
+                 "src/jmc/jabber/disco.py",
+                 "src/jmc/jabber/message.py",
+                 "src/jmc/jabber/presence.py",
+                 "src/jmc/jabber/presence.py",
+                 "src/jmc/model/__init__.py",
+                 "src/jmc/model/account.py"])
diff --git a/setup.py b/setup.py
index ca8b5fd..3348c66 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,13 @@
 ##
 
 from setuptools import setup, find_packages
+from distutils import sysconfig
+
+prefix = sysconfig.get_config_vars("prefix")
+if len(prefix) == 0 or prefix[0] == "/usr":
+    config_dir = "/etc/jabber"
+else:
+    config_dir = prefix[0] + "/etc/jabber"
 
 setup(name='jmc',
       version='0.3',
diff --git a/src/jmc/config.py b/src/jmc/config.py
deleted file mode 100644
index 1a7342a..0000000
--- a/src/jmc/config.py
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## config.py
-## Login : David Rousselie <dax@happycoders.org>
-## Started on  Fri Jan  7 11:06:42 2005 
-## $Id: config.py,v 1.2 2005/03/13 11:39:36 dax Exp $
-## 
-## Copyright (C) 2005 
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-## 
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## 
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-##
-
-import libxml2
-import os
-
-from pyxmpp.jid import JID
-from jmc.jabber.component import ComponentFatalError
-
-class Config:
-    def __init__(self, config_file):
-        self.doc = None
-        self.config_file = config_file
-#        libxml2.initializeCatalog()
-#         libxml2.loadCatalog(os.path.join(data_dir, "catalog.xml"))
-        parser = libxml2.createFileParserCtxt(config_file)
-#        parser.validate(1)
-        parser.parseDocument()
-        if not parser.isValid():
-            raise ComponentFatalError, "Invalid configuration"
-        self.doc = parser.doc()
-
-    def get_content(self, xpath):
-	return self.doc.xpathEval(xpath)[0].getContent()
-
-    def __del__(self):
-        if self.doc:
-            self.doc.freeDoc()
diff --git a/src/jmc/jabber/tests/__init__.py b/src/jmc/jabber/tests/__init__.py
index 9d63360..52df3e2 100644
--- a/src/jmc/jabber/tests/__init__.py
+++ b/src/jmc/jabber/tests/__init__.py
@@ -3,15 +3,16 @@ __revision__ = ""
 
 import unittest
 
-from jmc.jabber.tests import component, disco, command, message
+from jmc.jabber.tests import component, disco, command, message, presence
 
 def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(component.suite())
-    suite.addTest(disco.suite())
-    suite.addTest(command.suite())
-    suite.addTest(message.suite())
-    return suite
+    test_suite = unittest.TestSuite()
+    test_suite.addTest(component.suite())
+    test_suite.addTest(disco.suite())
+    test_suite.addTest(command.suite())
+    test_suite.addTest(message.suite())
+    test_suite.addTest(presence.suite())
+    return test_suite
 
 if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/src/jmc/jabber/tests/message.py b/src/jmc/jabber/tests/message.py
index 1122791..709ddd4 100644
--- a/src/jmc/jabber/tests/message.py
+++ b/src/jmc/jabber/tests/message.py
@@ -244,10 +244,10 @@ class RootSendMailMessageHandler_TestCase(JCLTestCase):
                                                   u"Cc": "cc@test.com"})
 
 def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(SendMailMessageHandler_TestCase, 'test'))
-    suite.addTest(unittest.makeSuite(RootSendMailMessageHandler_TestCase, 'test'))
-    return suite
+    test_suite = unittest.TestSuite()
+    test_suite.addTest(unittest.makeSuite(SendMailMessageHandler_TestCase, 'test'))
+    test_suite.addTest(unittest.makeSuite(RootSendMailMessageHandler_TestCase, 'test'))
+    return test_suite
 
 if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/src/jmc/tests/__init__.py b/src/jmc/tests/__init__.py
index 22ec1eb..d716105 100644
--- a/src/jmc/tests/__init__.py
+++ b/src/jmc/tests/__init__.py
@@ -8,12 +8,12 @@ from jmc.jabber import tests as jabber
 from jmc.model import tests as model
 
 def suite():
-    suite = unittest.TestSuite()
-    suite.addTest(lang.suite())
-    suite.addTest(runner.suite())
-    suite.addTest(jabber.suite())
-    suite.addTest(model.suite())
-    return suite
+    test_suite = unittest.TestSuite()
+    test_suite.addTest(lang.suite())
+    test_suite.addTest(runner.suite())
+    test_suite.addTest(jabber.suite())
+    test_suite.addTest(model.suite())
+    return test_suite
 
 if __name__ == '__main__':
     unittest.main(defaultTest='suite')