From 177a84a179e76a561b1cda457ac2fd8b10b72481 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 9 Nov 2007 03:35:38 +0000 Subject: Remove the workaround for \n -> \r\n transformations in SpawnTestCase.testLogfile() since the problem is solved by the patch from bug #198491. svn path=/main/trunk/; revision=8474 --- pym/portage/tests/ebuild/test_spawn.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/portage/tests/ebuild/test_spawn.py b/pym/portage/tests/ebuild/test_spawn.py index f582723bc..1ba6e5847 100644 --- a/pym/portage/tests/ebuild/test_spawn.py +++ b/pym/portage/tests/ebuild/test_spawn.py @@ -30,10 +30,11 @@ class SpawnTestCase(TestCase): f = open(logfile, 'r') log_content = f.read() f.close() - # When logging passes through a pty, it's lines will be separated - # by '\r\n', so use splitlines before comparing results. - self.assertEqual(test_string.splitlines(), - log_content.splitlines()) + # When logging passes through a pty, this comparison will fail + # unless the oflag terminal attributes have the termios.OPOST + # bit disabled. Otherwise, tranformations such as \n -> \r\n + # may occur. + self.assertEqual(test_string, log_content) finally: if logfile: try: -- cgit v1.2.3-1-g7c22