From 67f5b72d2722b0938259a2b6b8d2c028edd48ac9 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 20 Nov 2007 20:07:15 +0000 Subject: [PATCH] Remove the workaround for \n -> \r\n transformations in SpawnTestCase.testLogfile() since the problem is solved by the patch from bug #198491. (trunk r8474) svn path=/main/branches/2.1.2/; revision=8551 --- tests/portage/test_spawn.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/portage/test_spawn.py b/tests/portage/test_spawn.py index 5a8010621..596dc471e 100644 --- a/tests/portage/test_spawn.py +++ b/tests/portage/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: -- 2.26.2