Integrated test_skinf into test_publicationtraverse

2 files changed, 9 insertions, 37 deletions

diff --git a/src/zope/traversing/tests/test_publicationtraverse.py b/src/zope/traversing/tests/test_publicationtraverse.py
index dcf0478..e88d039 100644
--- a/src/zope/traversing/tests/test_publicationtraverse.py
+++ b/src/zope/traversing/tests/test_publicationtraverse.py
@@ -134,6 +134,14 @@ class TestPublicationTraverser(CleanUp, TestCase):
         self.assertEqual(view.__class__, View)
         self.assertEqual(view.name, 'more')
 
+    def testMissingSkin(self):
+        ob = Content()
+        from zope.traversing.publicationtraverse import PublicationTraverser
+        t = PublicationTraverser()
+        request = TestRequest()
+        self.assertRaises(
+            NotFound, t.traversePath, request, ob, '/++skin++missingskin')
+
 
 class IContent(Interface):
     pass
@@ -180,4 +188,4 @@ def test_suite():
     return makeSuite(TestPublicationTraverser)
 
 if __name__ == '__main__':
-    unittest.main()
+    main()
diff --git a/src/zope/traversing/tests/test_skinf.py b/src/zope/traversing/tests/test_skinf.py
deleted file mode 100644
index 6c5f8ef..0000000
--- a/src/zope/traversing/tests/test_skinf.py
+++ /dev/null
@@ -1,36 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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.
-#
-##############################################################################
-"""Functional tests for skin traversing
-
-$Id$
-"""
-import unittest
-from zope.app.testing import functional
-from zope.publisher.interfaces import NotFound
-from zope.traversing.tests.layer import TraversingLayer
-
-class TestSkin(functional.BrowserTestCase):
-
-    def test_missing_skin(self):
-        self.assertRaises(NotFound, self.publish, "/++skin++missingskin")
-
-def test_suite():
-    suite = unittest.TestSuite()
-    TestSkin.layer = TraversingLayer
-    suite.addTest(unittest.makeSuite(TestSkin))
-    return suite
-
-
-if __name__ == '__main__':
-    unittest.main()