[Zope3-checkins] SVN: Zope3/trunk/releases/Zope Make the release work again

[Stephan Richter]

Log message for revision 39796:
  Make the release work again
  

Changed:
  U   Zope3/trunk/releases/Zope/zopetest
  U   Zope3/trunk/releases/Zope-test.py

-=-
Modified: Zope3/trunk/releases/Zope/zopetest
===================================================================
--- Zope3/trunk/releases/Zope/zopetest	2005-10-31 21:32:32 UTC (rev 39795)
+++ Zope3/trunk/releases/Zope/zopetest	2005-10-31 21:39:43 UTC (rev 39796)
@@ -16,7 +16,7 @@
 
 $Id$
 """
-import sys, os
+import sys, os, warnings
 
 here = os.path.dirname(os.path.realpath(__file__))
 here = os.path.dirname(here)
@@ -27,12 +27,13 @@
     lib = os.path.join(here, "lib", "python")
 sys.path.append(lib)
 
-ftesting = os.path.join(here, "zopeskel", "etc", "ftesting.zcml")
+from zope.testing import testrunner
 
-import zope.app.tests.test
+defaults = ['--tests-pattern', '^f?tests$',
+            '--test-path', lib]
 
-zope.app.tests.test.FTESTING = ftesting
+# Get rid of twisted.conch.ssh warning
+warnings.filterwarnings(
+    'ignore', 'PyCrypto', RuntimeWarning, 'twisted[.]conch[.]ssh')
 
-if __name__ == '__main__':
-    args = sys.argv[:1] + ["-l", lib] + sys.argv[1:]
-    zope.app.tests.test.process_args(args)
+sys.exit(testrunner.run(defaults))

Modified: Zope3/trunk/releases/Zope-test.py
===================================================================
--- Zope3/trunk/releases/Zope-test.py	2005-10-31 21:32:32 UTC (rev 39795)
+++ Zope3/trunk/releases/Zope-test.py	2005-10-31 21:39:43 UTC (rev 39796)
@@ -14,9 +14,7 @@
 do('./configure --prefix `pwd`/z --with-python=%s' %sys.executable)
 do('make install')
 os.chdir('z')
-do("bin/zopetest '!(ZEO|ZODB|BTrees)'")
-do("bin/mkzopeinstance -d`pwd`/../i -uadmin:123")
+do("bin/zopetest -vp '!(ZEO|ZODB|BTrees)'")
+do("bin/mkzopeinstance -d`pwd`/../i -uadmin:123 -m SHA1")
 os.chdir('../i')
-do("bin/test")
-
-
+do("bin/test --testzope -vp")