Changeset - 062b4418ca9d
[Not reviewed]
default
0 1 0
Thomas De Schampheleire - 10 years ago 2016-05-14 21:00:02
thomas.de.schampheleire@gmail.com
pytest migration: remove temporary assert stubs
1 file changed with 0 insertions and 24 deletions:
0 comments (0 inline, 0 general)
kallithea/tests/__init__.py
Show inline comments
 
@@ -230,48 +230,24 @@ class BaseTestController(object):
 
                           (msg, skip,
 
                            ', '.join('`%s`' % m for level, m in response.session['flash']))))
 

	
 
    def checkSessionFlashRegex(self, response, regex, skip=0):
 
        self.checkSessionFlash(response, regex, skip=skip, _matcher=re.search)
 

	
 
class TestController(BaseTestCase, BaseTestController):
 
    """Deprecated unittest-style test controller"""
 

	
 
    def __init__(self, *args, **kwargs):
 
        super(TestController, self).__init__(*args, **kwargs)
 
        self.init()
 

	
 
class TestControllerPytest(BaseTestController):
 
    """Pytest-style test controller"""
 

	
 
    # Note: pytest base classes cannot have an __init__ method
 

	
 
    @pytest.fixture(autouse=True)
 
    def app_fixture(self):
 
        self.wsgiapp = pylons.test.pylonsapp
 
        init_stack(self.wsgiapp.config)
 
        self.init()
 
        return self.app
 

	
 
    # transitional implementations of unittest.TestCase asserts
 
    # Users of these should be converted to pytest's single 'assert' call
 
    def assertEqual(self, first, second, msg=None):
 
        assert first == second
 
    def assertNotEqual(self, first, second, msg=None):
 
        assert first != second
 
    def assertTrue(self, expr, msg=None):
 
        assert bool(expr) is True
 
    def assertFalse(self, expr, msg=None):
 
        assert bool(expr) is False
 
    def assertIn(self, first, second, msg=None):
 
        assert first in second
 
    def assertNotIn(self, first, second, msg=None):
 
        assert first not in second
 
    def assertSetEqual(self, first, second, msg=None):
 
        assert first == second
 
    def assertListEqual(self, first, second, msg=None):
 
        assert first == second
 
    def assertDictEqual(self, first, second, msg=None):
 
        assert first == second
 
    def assertRaises(self, exception, method, *args, **kwargs):
 
        with pytest.raises(exception):
 
            method(*args, **kwargs)
0 comments (0 inline, 0 general)