[Python-checkins] cpython (2.7): Issue #18982: Fixed newlines in calendar CLI tests on Windows.
serhiy.storchaka
python-checkins at python.org
Thu Feb 5 17:04:41 CET 2015
https://hg.python.org/cpython/rev/f2991b52157e
changeset: 94522:f2991b52157e
branch: 2.7
parent: 94519:50a5c262b2e6
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Feb 05 18:03:27 2015 +0200
summary:
Issue #18982: Fixed newlines in calendar CLI tests on Windows.
files:
Lib/test/test_calendar.py | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -471,6 +471,9 @@
self.assertEqual(calendar.leapdays(1997,2020), 5)
+def conv(s):
+ return s.replace('\n', os.linesep)
+
class CommandLineTestCase(unittest.TestCase):
def run_ok(self, *args):
return assert_python_ok('-m', 'calendar', *args)[1]
@@ -501,17 +504,17 @@
def test_output_year(self):
stdout = self.run_ok('2004')
- self.assertEqual(stdout.strip(), result_2004_text.strip())
+ self.assertEqual(stdout.strip(), conv(result_2004_text).strip())
def test_output_month(self):
stdout = self.run_ok('2004', '1')
- self.assertEqual(stdout.strip(), result_2004_01_text.strip())
+ self.assertEqual(stdout.strip(), conv(result_2004_01_text).strip())
def test_option_encoding(self):
self.assertFailure('-e')
self.assertFailure('--encoding')
stdout = self.run_ok('--encoding', 'rot-13', '2004')
- self.assertEqual(stdout.strip(), result_2004_text.encode('rot-13').strip())
+ self.assertEqual(stdout.strip(), conv(result_2004_text.encode('rot-13')).strip())
def test_option_locale(self):
self.assertFailure('-L')
@@ -543,7 +546,7 @@
self.assertFailure('--lines')
self.assertFailure('-l', 'spam')
stdout = self.run_ok('--lines', '2', '2004')
- self.assertIn('December\n\nMo Tu We', stdout)
+ self.assertIn(conv('December\n\nMo Tu We'), stdout)
def test_option_spacing(self):
self.assertFailure('-s')
@@ -557,14 +560,14 @@
self.assertFailure('--month')
self.assertFailure('-m', 'spam')
stdout = self.run_ok('--months', '1', '2004')
- self.assertIn('\nMo Tu We Th Fr Sa Su\n', stdout)
+ self.assertIn(conv('\nMo Tu We Th Fr Sa Su\n'), stdout)
def test_option_type(self):
self.assertFailure('-t')
self.assertFailure('--type')
self.assertFailure('-t', 'spam')
stdout = self.run_ok('--type', 'text', '2004')
- self.assertEqual(stdout.strip(), result_2004_text.strip())
+ self.assertEqual(stdout.strip(), conv(result_2004_text).strip())
stdout = self.run_ok('--type', 'html', '2004')
self.assertEqual(stdout[:6], b'<?xml ')
self.assertIn(b'<title>Calendar for 2004</title>', stdout)
@@ -579,7 +582,7 @@
def test_html_output_year_encoding(self):
stdout = self.run_ok('-t', 'html', '--encoding', 'ascii', '2004')
- self.assertEqual(stdout.strip(), result_2004_html.strip())
+ self.assertEqual(stdout.strip(), conv(result_2004_html).strip())
def test_html_output_year_css(self):
self.assertFailure('-t', 'html', '-c')
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list