[Checkins] SVN: zope.password/branches/ulif-zpasswd/src/zope/password/tests/test_zpasswd.py * Copy testsetup pieces from z.a.server.

Uli Fouquet uli at gnufix.de
Fri May 7 09:44:05 EDT 2010


Log message for revision 112131:
  * Copy testsetup pieces from z.a.server.
  
  * Let tests apply to new package location.
  

Changed:
  U   zope.password/branches/ulif-zpasswd/src/zope/password/tests/test_zpasswd.py

-=-
Modified: zope.password/branches/ulif-zpasswd/src/zope/password/tests/test_zpasswd.py
===================================================================
--- zope.password/branches/ulif-zpasswd/src/zope/password/tests/test_zpasswd.py	2010-05-07 13:36:18 UTC (rev 112130)
+++ zope.password/branches/ulif-zpasswd/src/zope/password/tests/test_zpasswd.py	2010-05-07 13:44:05 UTC (rev 112131)
@@ -17,17 +17,35 @@
 """
 
 import os
+import sys
 import unittest, doctest
+from StringIO import StringIO
 
-from zope.password import password
-from zope.app.server.tests.test_mkzopeinstance import TestBase
+from zope.password import password, zpasswd
 
-from zope.app.server import zpasswd
+class TestBase(unittest.TestCase):
+    def setUp(self):
+        # Create a minimal site.zcml file
+        open('testsite.zcml', 'wb').write(
+            '<configure xmlns="http://namespaces.zope.org/zope"/>\n'
+            )
+        self.stdout = StringIO()
+        self.stderr = StringIO()
+        self.old_stdout = sys.stdout
+        self.old_stderr = sys.stderr
+        sys.stdout = self.stdout
+        sys.stderr = self.stderr
 
+    def tearDown(self):
+        sys.stdout = self.old_stdout
+        sys.stderr = self.old_stderr
+        # Clean up
+        os.unlink('testsite.zcml')
 
+
 class ArgumentParsingTestCase(TestBase):
 
-    config = os.path.join(os.path.dirname(__file__), "site.zcml")
+    config = "testsite.zcml"
 
     def parse_args(self, args):
         argv = ["foo/bar.py"] + args
@@ -130,7 +148,7 @@
 
 
 def test_suite():
-    suite = doctest.DocTestSuite('zope.app.server.zpasswd')
+    suite = doctest.DocTestSuite('zope.password.zpasswd')
     suite.addTest(unittest.makeSuite(ArgumentParsingTestCase))
     suite.addTest(unittest.makeSuite(InputCollectionTestCase))
     return suite



More information about the checkins mailing list