Make more tests pass in a non utf-8 locale

sebastinas · sebastinas · commit 7bcaf4c02c6c · 2015-02-04T15:46:51.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -74,11 +74,18 @@ def test_completion(self):
         self.repl.height, self.repl.width = (5, 32)
         self.repl.current_line = 'se'
         self.cursor_offset = 2
-        screen = [u'>>> se',
-                  u'┌───────────────────────┐',
-                  u'│ set(     setattr(     │',
-                  u'└───────────────────────┘',
-                  u'Welcome to bpython! Press <F1> f']
+        if config.supports_box_chars():
+            screen = [u'>>> se',
+                      u'┌───────────────────────┐',
+                      u'│ set(     setattr(     │',
+                      u'└───────────────────────┘',
+                      u'Welcome to bpython! Press <F1> f']
+        else:
+            screen = [u'>>> se',
+                      u'+-----------------------+',
+                      u'| set(     setattr(     |',
+                      u'+-----------------------+',
+                      u'Welcome to bpython! Press <F1> f']
         self.assert_paint_ignoring_formatting(screen, (0, 4))
 
     def test_argspec(self):
@@ -100,11 +107,19 @@ def test_formatted_docstring(self):
         self.assertFSArraysEqualIgnoringFormatting(actual, expected)
 
     def test_paint_lasts_events(self):
-        actual = replpainter.paint_last_events(4, 100, ['a', 'b', 'c'], config=setup_config())
-        expected = fsarray(["┌─┐",
-                            "│c│",
-                            "│b│",
-                            "└─┘"])
+        actual = replpainter.paint_last_events(4, 100, ['a', 'b', 'c'],
+                                               config=setup_config())
+        if config.supports_box_chars():
+            expected = fsarray(["┌─┐",
+                                "│c│",
+                                "│b│",
+                                "└─┘"])
+        else:
+            expected = fsarray(["+-+",
+                                "|c|",
+                                "|b|",
+                                "+-+"])
+
         self.assertFSArraysEqualIgnoringFormatting(actual, expected)
 
 @contextmanager
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -1,4 +1,6 @@
 # coding: utf8
+from __future__ import unicode_literals
+
 import code
 from contextlib import contextmanager
 from mock import Mock, patch, MagicMock
@@ -53,13 +55,14 @@ def test_code_finished_will_parse(self):
         self.assertTrue(self.cfwp('\n'.join(self.repl.buffer)), (True, True))
 
     def test_external_communication(self):
-        self.assertEqual(type(self.repl.help_text()), type(b''))
         self.repl.send_current_block_to_external_editor()
         self.repl.send_session_to_external_editor()
 
+    @unittest.skipIf(not all(map(config.can_encode, 'å∂ßƒ')),
+                     'Charset can not encode characters')
     def test_external_communication_encoding(self):
         with captured_output():
-            self.repl.display_lines.append(u'>>> "åß∂ƒ"')
+            self.repl.display_lines.append('>>> "åß∂ƒ"')
             self.repl.send_session_to_external_editor()
 
     def test_get_last_word(self):
@@ -269,19 +272,23 @@ class TestCurtsiesPagerText(TestCase):
 
     def setUp(self):
         self.repl = create_repl()
-        self.repl.pager = self.assert_pager_gets_bytes
+        self.repl.pager = self.assert_pager_gets_unicode
 
-    def assert_pager_gets_bytes(self, text):
-        self.assertIsInstance(text, type(b''))
+    def assert_pager_gets_unicode(self, text):
+        self.assertIsInstance(text, type(''))
 
     def test_help(self):
         self.repl.pager(self.repl.help_text())
 
+    @unittest.skipIf(not all(map(config.can_encode, 'å∂ßƒ')),
+                     'Charset can not encode characters')
     def test_show_source_not_formatted(self):
         self.repl.config.highlight_show_source = False
         self.repl.get_source_of_current_name = lambda: 'source code å∂ßƒåß∂ƒ'
         self.repl.show_source()
 
+    @unittest.skipIf(not all(map(config.can_encode, 'å∂ßƒ')),
+                     'Charset can not encode characters')
     def test_show_source_formatted(self):
         self.repl.config.highlight_show_source = True
         self.repl.get_source_of_current_name = lambda: 'source code å∂ßƒåß∂ƒ'
