blob: c3d1e06d003e480b2cdaf2c909fff500cea2ed9c [file] [log] [blame]
Brad Bishopc68388fc2019-08-26 01:33:31 -04001From b94995e0c694ec9561efec0d1a59b323340e6105 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 5 Aug 2019 15:57:39 +0800
4Subject: [PATCH] test_locale.py: correct the test output format
5
6Before this patch:
7 # python3 -m test -v test_locale
8 [snip]
9 test_getsetlocale_issue1813 (test.test_locale.TestMiscellaneous) ... testing with ('tr_TR', 'ISO8859-9') ok
10 [snip]
11
12 After this patch:
13 # python3 -m test -v test_locale
14 [snip]
15 test_getsetlocale_issue1813 (test.test_locale.TestMiscellaneous) ... testing with ('tr_TR', 'ISO8859-9')... ok
16 [snip]
17
18 Make the test ended with "... ok" is common in python
19 unittest world, we should make it keep consistent
20 with other test cases in case it may be ignored to
21 record in the report if we use the common filter
22 "... ok".
23
24Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132]
25
Andrew Geisslerc926e172021-05-07 16:11:35 -050026
27Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org>
28
Brad Bishopc68388fc2019-08-26 01:33:31 -040029Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
30---
31 Lib/test/test_locale.py | 2 +-
32 1 file changed, 1 insertion(+), 1 deletion(-)
33
Andrew Geisslerc926e172021-05-07 16:11:35 -050034Index: Python-3.9.4/Lib/test/test_locale.py
35===================================================================
36--- Python-3.9.4.orig/Lib/test/test_locale.py
37+++ Python-3.9.4/Lib/test/test_locale.py
38@@ -562,7 +562,7 @@ class TestMiscellaneous(unittest.TestCas
Brad Bishopc68388fc2019-08-26 01:33:31 -040039 self.skipTest('test needs Turkish locale')
40 loc = locale.getlocale(locale.LC_CTYPE)
41 if verbose:
42- print('testing with %a' % (loc,), end=' ', flush=True)
43+ print('testing with %a...' % (loc,), end=' ', flush=True)
Andrew Geisslerc926e172021-05-07 16:11:35 -050044 try:
45 locale.setlocale(locale.LC_CTYPE, loc)
46 except locale.Error as exc: