From 3aa3a3e1fdfda132c748d53ccec7dee03d617a6d Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 27 Jul 2012 19:53:44 +0100 Subject: [PATCH] Fix some tests to account for new py3k quirks --- testtools/tests/test_testcase.py | 5 +++-- testtools/tests/test_testresult.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/testtools/tests/test_testcase.py b/testtools/tests/test_testcase.py index 3d7b29b..eca781b 100644 --- a/testtools/tests/test_testcase.py +++ b/testtools/tests/test_testcase.py @@ -263,7 +263,8 @@ class TestAssertions(TestCase): # assertRaises raises self.failureException when it's passed a # callable that raises no error. ret = ('orange', 42) - self.assertFails(" at ...> returned ('orange', 42)", + self.assertFails( + " at ...> returned ('orange', 42)", self.assertRaises, RuntimeError, lambda: ret) def test_assertRaises_fails_when_different_error_raised(self): @@ -309,7 +310,7 @@ class TestAssertions(TestCase): self.assertRaises( self.failureException, self.assertRaises, expectedExceptions, lambda: None) - self.assertFails(' at ...> returned None', + self.assertFails(' at ...> returned None', self.assertRaises, expectedExceptions, lambda: None) def test_assertRaises_function_repr_in_exception(self): diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py index b6cafd1..aaae77c 100644 --- a/testtools/tests/test_testresult.py +++ b/testtools/tests/test_testresult.py @@ -1579,7 +1579,9 @@ class TestNonAsciiResults(TestCase): textoutput = self._test_external_case( modulelevel="import os", 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) else: self.assertIn(self._as_output("WindowsError: "), textoutput)