2 files changed, 11 insertions, 48 deletions
diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py
index 1333390c5..3116d2572 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/repoze/bfg/tests/test_router.py
@@ -265,22 +265,6 @@ class RouterTests(unittest.TestCase):
         self.assertEqual(environ['webob.adhoc_attrs']['context'], context)
         self.assertEqual(environ['webob.adhoc_attrs']['root'], context)
 
-    def test_call_deprecation_warning(self):
-        context = DummyContext()
-        self._registerTraverserFactory(context, _deprecation_warning='abc')
-        response = DummyResponse()
-        response.app_iter = ['Hello world']
-        view = DummyView(response)
-        environ = self._makeEnviron()
-        self._registerView(view, '', None, None)
-        router = self._makeOne()
-        logger = self._registerLogger()
-        router.logger = logger
-        start_response = DummyStartResponse()
-        router(environ, start_response)
-        self.assertEqual(len(logger.messages), 1)
-        self.assertEqual(logger.messages[0], 'abc')
-
     def test_call_view_registered_nonspecific_nondefault_path_and_subpath(self):
         context = DummyContext()
         self._registerTraverserFactory(context, view_name='foo',
diff --git a/repoze/bfg/tests/test_traversal.py b/repoze/bfg/tests/test_traversal.py
index 3f347dc22..a4e90bc07 100644
--- a/repoze/bfg/tests/test_traversal.py
+++ b/repoze/bfg/tests/test_traversal.py
@@ -953,6 +953,17 @@ class TraverseTests(unittest.TestCase):
         self.assertEqual(root.wascontext, True)
         self.assertEqual(root.environ['PATH_INFO'], '/')
 
+    def test_empty_sequence(self):
+        root = DummyContext()
+        model = DummyContext()
+        model.__parent__ = root
+        model.__name__ = 'baz'
+        traverser = make_traverser({'context':root, 'view_name':''})
+        self._registerTraverserFactory(traverser)
+        self._callFUT(model, [])
+        self.assertEqual(model.wascontext, True)
+        self.assertEqual(model.environ['PATH_INFO'], '')
+
 class UnderTraverseTests(unittest.TestCase):
     def setUp(self):
         cleanUp()
@@ -990,38 +1001,6 @@ class UnderTraverseTests(unittest.TestCase):
         result = self._callFUT(context, None, traverser)
         self.assertEqual(result, {'a':'1'})
 
-    def test_issixtuple(self):
-        traverser = make_traverser((1,2,3,4,5,6))
-        self._registerTraverserFactory(traverser)
-        context = DummyContext()
-        result = self._callFUT(context, None)
-        self.assertEqual(result['context'], 1)
-        self.assertEqual(result['view_name'], 2)
-        self.assertEqual(result['subpath'], 3)
-        self.assertEqual(result['traversed'], 4)
-        self.assertEqual(result['virtual_root'], 5)
-        self.assertEqual(result['virtual_root_path'], 6)
-        self.assertEqual(result['root'], None)
-        self.failUnless(result['_deprecation_warning'].startswith(
-               "<class 'repoze.bfg.tests.test_traversal.DummyTraverser'>"))
-        self.failUnless("6-argument tuple" in result['_deprecation_warning'])
-
-    def test_isthreetuple(self):
-        traverser = make_traverser((1,2,3))
-        self._registerTraverserFactory(traverser)
-        context = DummyContext()
-        result = self._callFUT(context, None)
-        self.assertEqual(result['context'], 1)
-        self.assertEqual(result['view_name'], 2)
-        self.assertEqual(result['subpath'], 3)
-        self.assertEqual(result['traversed'], None)
-        self.assertEqual(result['virtual_root'], None)
-        self.assertEqual(result['virtual_root_path'], None)
-        self.assertEqual(result['root'], None)
-        self.failUnless(result['_deprecation_warning'].startswith(
-               "<class 'repoze.bfg.tests.test_traversal.DummyTraverser'>"))
-        self.failUnless("3-argument tuple" in result['_deprecation_warning'])
-
 def make_traverser(result):
     class DummyTraverser(object):
         def __init__(self, context):