Chris McDonough
2011-09-05 89e7ec6d85709a0492e2d248e4420a62cf75641e
hail mary checkin to fix reported test failures on unknown systems that isnt replicable on my own
7 files modified
16 ■■■■■ changed files
docs/tutorials/wiki2/src/tests/tutorial/tests.py 1 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/views/tutorial/tests.py 1 ●●●● patch | view | raw | blame | history
pyramid/tests/test_events.py 1 ●●●● patch | view | raw | blame | history
pyramid/tests/test_mako_templating.py 1 ●●●● patch | view | raw | blame | history
pyramid/tests/test_response.py 1 ●●●● patch | view | raw | blame | history
pyramid/tests/test_scripting.py 10 ●●●●● patch | view | raw | blame | history
pyramid/tests/test_settings.py 1 ●●●● patch | view | raw | blame | history
docs/tutorials/wiki2/src/tests/tutorial/tests.py
@@ -115,7 +115,6 @@
    def setUp(self):
        self.session = _initTestingDB()
        self.config = testing.setUp()
        self.config.begin()
    def tearDown(self):
        self.session.remove()
docs/tutorials/wiki2/src/views/tutorial/tests.py
@@ -72,7 +72,6 @@
    def setUp(self):
        self.session = _initTestingDB()
        self.config = testing.setUp()
        self.config.begin()
    def tearDown(self):
        self.session.remove()
pyramid/tests/test_events.py
@@ -124,7 +124,6 @@
    def setUp(self):
        registry = DummyRegistry()
        self.config = testing.setUp(registry=registry)
        self.config.begin()
    def tearDown(self):
        self.config.end()
pyramid/tests/test_mako_templating.py
@@ -322,7 +322,6 @@
    def setUp(self):
        import pyramid.mako_templating
        self.config = testing.setUp()
        self.config.begin()
        self.config.add_settings({'mako.directories':
                                  'pyramid.tests:fixtures'})
        self.config.add_renderer('.mak',
pyramid/tests/test_response.py
@@ -37,7 +37,6 @@
    def setUp(self):
        registry = Dummy()
        self.config = testing.setUp(registry=registry)
        self.config.begin()
    def tearDown(self):
        self.config.end()
pyramid/tests/test_scripting.py
@@ -104,10 +104,12 @@
        # keep registry local so that global_registries is cleared after
        registry = DummyRegistry(DummyFactory)
        global_registries.add(registry)
        request = self._callFUT('/hello')
        self.assertEqual(request.environ['path'], '/hello')
        self.assertEqual(request.registry, registry)
        global_registries.empty()
        try:
            request = self._callFUT('/hello')
            self.assertEqual(request.environ['path'], '/hello')
            self.assertEqual(request.registry, registry)
        finally:
            global_registries.empty()
class Dummy:
    pass
pyramid/tests/test_settings.py
@@ -6,7 +6,6 @@
        from pyramid.registry import Registry
        registry = Registry('testing')
        self.config = testing.setUp(registry=registry)
        self.config.begin()
        from zope.deprecation import __show__
        __show__.off()