[Repoze-checkins] r935 - in repoze.zope2/trunk: . repoze/zope2/scripts

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Fri May  2 12:54:31 2008
New Revision: 935

Log:
  - Cause zope2testrunner to sys.exit with a nonzero exit code when
    any tests fail (for usage under buildbot).

  - Filter warnings during addzope2user.



Modified:
   repoze.zope2/trunk/CHANGES.txt
   repoze.zope2/trunk/repoze/zope2/scripts/adduser.py
   repoze.zope2/trunk/repoze/zope2/scripts/finder.py
   repoze.zope2/trunk/repoze/zope2/scripts/testrunner.py
   repoze.zope2/trunk/setup.py

Modified: repoze.zope2/trunk/CHANGES.txt
==============================================================================
--- repoze.zope2/trunk/CHANGES.txt	(original)
+++ repoze.zope2/trunk/CHANGES.txt	Fri May  2 12:54:31 2008
@@ -1,3 +1,10 @@
+0.3.8 (2008-05-02)
+
+  - Cause zope2testrunner to sys.exit with a nonzero exit code when
+    any tests fail (for usage under buildbot).
+
+  - Filter warnings during addzope2user.
+
 0.3.7 (2008-04-18)
 
   - "Legacy" (VHM) virtual hosting was broken for virtual host roots

Modified: repoze.zope2/trunk/repoze/zope2/scripts/adduser.py
==============================================================================
--- repoze.zope2/trunk/repoze/zope2/scripts/adduser.py	(original)
+++ repoze.zope2/trunk/repoze/zope2/scripts/adduser.py	Fri May  2 12:54:31 2008
@@ -31,6 +31,7 @@
         print "%s <username> <password>" % argv[0]
         sys.exit(255)
     finder = ZopeFinder(argv)
+    finder.filter_warnings()
     app = finder.get_app()
     adduser(app, user, pwd)
 

Modified: repoze.zope2/trunk/repoze/zope2/scripts/finder.py
==============================================================================
--- repoze.zope2/trunk/repoze/zope2/scripts/finder.py	(original)
+++ repoze.zope2/trunk/repoze/zope2/scripts/finder.py	Fri May  2 12:54:31 2008
@@ -18,6 +18,10 @@
     def __init__(self, argv):
         self.cmd = argv[0]
 
+    def filter_warnings(self):
+        import warnings
+        warnings.simplefilter('ignore', Warning, append=True)
+
     def get_app(self, config_file=None):
         # given a config file, return a Zope application object
         if config_file is None:

Modified: repoze.zope2/trunk/repoze/zope2/scripts/testrunner.py
==============================================================================
--- repoze.zope2/trunk/repoze/zope2/scripts/testrunner.py	(original)
+++ repoze.zope2/trunk/repoze/zope2/scripts/testrunner.py	Fri May  2 12:54:31 2008
@@ -31,13 +31,13 @@
     '--nowarnings', action="callback", callback=filter_warnings,
     help="Install a filter to suppress warnings emitted by code.")
 
-def main(argv=sys.argv):
+def main(argv=sys.argv, exit=sys.exit):
     finder = ZopeFinder(argv)
     config_file = finder.get_zope_conf()
     import Zope2
     print 'Parsing %s' % config_file
     Zope2.configure(config_file)
-    import App.FindHomes
+    import App.FindHomes # import for side effects
     ihome = os.getenv('INSTANCE_HOME')
     products = os.path.join(ihome, 'Products')
     defaults = []
@@ -50,7 +50,9 @@
     sys.path.append(os.path.dirname(scriptdir))
     for path in sys.path:
         defaults += ['--test-path', path]
-    return testrunner.run(defaults + argv[1:])
+    failed = testrunner.run(defaults + argv[1:])
+    if failed:
+        exit(1)
 
 if __name__ == '__main__':
     sys.exit(main())

Modified: repoze.zope2/trunk/setup.py
==============================================================================
--- repoze.zope2/trunk/setup.py	(original)
+++ repoze.zope2/trunk/setup.py	Fri May  2 12:54:31 2008
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '0.3.7'
+__version__ = '0.3.8'
 
 from ez_setup import use_setuptools
 use_setuptools()