diff --git a/tests/Exscript/util/ttyTest.py b/tests/Exscript/util/ttyTest.py index a3f95c3d..7fc2dd98 100644 --- a/tests/Exscript/util/ttyTest.py +++ b/tests/Exscript/util/ttyTest.py @@ -50,25 +50,28 @@ def testGetTerminalSize(self): self.assertEqual(get_terminal_size(10, 10), (10, 10)) # If the LINES and COLUMNS variables are set, they should be used. - os.environ['LINES'] = '1000' - os.environ['COLUMNS'] = '1000' - self.assertEqual(get_terminal_size(), (1000, 1000)) - self.assertEqual(get_terminal_size(10, 10), (1000, 1000)) + os.environ['LINES'] = '1111' + os.environ['COLUMNS'] = '1111' + self.assertEqual(get_terminal_size(), (1111, 1111)) + self.assertEqual(get_terminal_size(10, 10), (1111, 1111)) # If the stty program exists, it should be used. os.environ['PATH'] = oldpath try: - with Popen(['stty', 'size'], stdout=PIPE, stderr=PIPE): - self.assertNotEqual(get_terminal_size(), (1000, 1000)) - self.assertNotEqual(get_terminal_size(10, 10), (1000, 1000)) + # Unfortunately, the 'stty' program on travis actually returns + # (1111, 1111) if the LINES and COLUMNS env variables are set, + # so there is no way to tests whether stty was used or the env + # vars. + #self.assertNotEqual(get_terminal_size(), (1111, 1111)) + self.assertNotEqual(get_terminal_size(10, 10), (25, 80)) except OSError: pass # "stty" not found. # Lastly, if stdin/stderr/stdout exist, they should tell us something. os.environ['PATH'] = '' self._unredirect() - self.assertNotEqual(get_terminal_size(), (1000, 1000)) - self.assertNotEqual(get_terminal_size(10, 10), (1000, 1000)) + self.assertNotEqual(get_terminal_size(), (1111, 1111)) + self.assertNotEqual(get_terminal_size(10, 10), (1111, 1111)) os.environ['PATH'] = oldpath