openstack/deb-python-testtools
Code Issues Proposed changes

Fix some tests to account for new py3k quirks

Browse Source
This commit is contained in:
Martin
2012-07-27 19:53:44 +01:00
parent da37fd0364
commit 3aa3a3e1fd
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
testtools/tests/test_testcase.py
View File

@@ -263,7 +263,8 @@ class TestAssertions(TestCase):
# assertRaises raises self.failureException when it's passed a # assertRaises raises self.failureException when it's passed a
# callable that raises no error. # callable that raises no error.
ret = ('orange', 42) ret = ('orange', 42)
self.assertFails("<function <lambda> at ...> returned ('orange', 42)", self.assertFails(
"<function ...<lambda> at ...> returned ('orange', 42)",
self.assertRaises, RuntimeError, lambda: ret) self.assertRaises, RuntimeError, lambda: ret)
def test_assertRaises_fails_when_different_error_raised(self): def test_assertRaises_fails_when_different_error_raised(self):
@@ -309,7 +310,7 @@ class TestAssertions(TestCase):
self.assertRaises( self.assertRaises(
self.failureException, self.failureException,
self.assertRaises, expectedExceptions, lambda: None) self.assertRaises, expectedExceptions, lambda: None)
self.assertFails('<function <lambda> at ...> returned None', self.assertFails('<function ...<lambda> at ...> returned None',
self.assertRaises, expectedExceptions, lambda: None) self.assertRaises, expectedExceptions, lambda: None)
def test_assertRaises_function_repr_in_exception(self): def test_assertRaises_function_repr_in_exception(self):

4
testtools/tests/test_testresult.py
View File

@@ -1579,7 +1579,9 @@ class TestNonAsciiResults(TestCase):
textoutput = self._test_external_case( textoutput = self._test_external_case(
modulelevel="import os", modulelevel="import os",
testline="os.mkdir('/')") testline="os.mkdir('/')")
if os.name != "nt" or sys.version_info < (2, 5): if sys.version_info > (3, 3):
self.assertIn(self._as_output("PermissionError: "), textoutput)
elif os.name != "nt" or sys.version_info < (2, 5):
self.assertIn(self._as_output("OSError: "), textoutput) self.assertIn(self._as_output("OSError: "), textoutput)
else: else:
self.assertIn(self._as_output("WindowsError: "), textoutput) self.assertIn(self._as_output("WindowsError: "), textoutput)