[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/publication/ merge ftests into tests

[Bernd Dorn]

Log message for revision 73763:
  merge ftests into tests

Changed:
  D   Zope3/trunk/src/zope/app/publication/ftests.py
  A   Zope3/trunk/src/zope/app/publication/tests/test_functional.py

-=-
Deleted: Zope3/trunk/src/zope/app/publication/ftests.py
===================================================================
--- Zope3/trunk/src/zope/app/publication/ftests.py	2007-03-27 14:36:38 UTC (rev 73762)
+++ Zope3/trunk/src/zope/app/publication/ftests.py	2007-03-27 14:42:00 UTC (rev 73763)
@@ -1,37 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Test not found errors
-
-$Id$
-"""
-import unittest
-from zope.app.testing import functional
-from zope.app.publication.testing import PublicationLayer
-
-def test_suite():
-    notfound = functional.FunctionalDocFileSuite('notfound.txt')
-    notfound.layer = PublicationLayer
-    methodnotallowed = functional.FunctionalDocFileSuite('methodnotallowed.txt')
-    methodnotallowed.layer = PublicationLayer
-    httpfactory = functional.FunctionalDocFileSuite('httpfactory.txt')
-    httpfactory.layer = PublicationLayer
-    return unittest.TestSuite((
-        notfound,
-        methodnotallowed,
-        httpfactory,
-        ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-

Copied: Zope3/trunk/src/zope/app/publication/tests/test_functional.py (from rev 73638, Zope3/trunk/src/zope/app/publication/ftests.py)
===================================================================
--- Zope3/trunk/src/zope/app/publication/ftests.py	2007-03-26 16:27:10 UTC (rev 73638)
+++ Zope3/trunk/src/zope/app/publication/tests/test_functional.py	2007-03-27 14:42:00 UTC (rev 73763)
@@ -0,0 +1,37 @@
+##############################################################################
+#
+# Copyright (c) 2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Test not found errors
+
+$Id$
+"""
+import unittest
+from zope.app.testing import functional
+from zope.app.publication.testing import PublicationLayer
+
+def test_suite():
+    notfound = functional.FunctionalDocFileSuite('../notfound.txt')
+    notfound.layer = PublicationLayer
+    methodnotallowed = functional.FunctionalDocFileSuite('../methodnotallowed.txt')
+    methodnotallowed.layer = PublicationLayer
+    httpfactory = functional.FunctionalDocFileSuite('../httpfactory.txt')
+    httpfactory.layer = PublicationLayer
+    return unittest.TestSuite((
+        notfound,
+        methodnotallowed,
+        httpfactory,
+        ))
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
+