specialize source finding error messages

thomasballinger · thomasballinger · commit 9bc21e59d30f · 2015-03-07T08:52:30.000-05:00
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -2,6 +2,8 @@
 
 from __future__ import unicode_literals
 
+import sys
+
 try:
     import unittest2 as unittest
 except ImportError:
@@ -13,6 +15,8 @@
 from bpython._py3compat import py3
 from bpython.test import mock
 
+pypy = 'PyPy' in sys.version
+
 
 class TestInterpreter(unittest.TestCase):
     def test_syntaxerror(self):
@@ -25,9 +29,14 @@ def append_to_a(message):
         i.write = append_to_a
         i.runsource('1.1.1.1')
 
-        expected = '  File ' + green('"<input>"') + ', line ' + \
-            bold(magenta('1')) + '\n    1.1.1.1\n        ^\n' + \
-            bold(red('SyntaxError')) + ': ' + cyan('invalid syntax') + '\n'
+        if pypy:
+            expected = '  File ' + green('"<input>"') + ', line ' + \
+                bold(magenta('1')) + '\n    1.1.1.1\n      ^\n' + \
+                bold(red('SyntaxError')) + ': ' + cyan('invalid syntax') + '\n'
+        else:
+            expected = '  File ' + green('"<input>"') + ', line ' + \
+                bold(magenta('1')) + '\n    1.1.1.1\n        ^\n' + \
+                bold(red('SyntaxError')) + ': ' + cyan('invalid syntax') + '\n'
 
         self.assertMultiLineEqual(str(plain('').join(a)), str(expected))
         self.assertEquals(plain('').join(a), expected)
@@ -49,10 +58,15 @@ def g():
 
         i.runsource('g()')
 
+        if pypy:
+            global_not_found = "global name 'g' is not defined"
+        else:
+            global_not_found = "name 'g' is not defined"
+
         expected = 'Traceback (most recent call last):\n  File ' + \
             green('"<input>"') + ', line ' + bold(magenta('1')) + ', in ' + \
             cyan('<module>') + '\n' + bold(red('NameError')) + ': ' + \
-            cyan("name 'g' is not defined") + '\n'
+            cyan(global_not_found) + '\n'
 
         self.assertMultiLineEqual(str(plain('').join(a)), str(expected))
         self.assertEquals(plain('').join(a), expected)
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -1,10 +1,12 @@
-import collections
 from itertools import islice
+import collections
+import inspect
 import os
 import shutil
 import socket
 import tempfile
 from six.moves import range
+import sys
 
 try:
     import unittest2 as unittest
@@ -15,6 +17,7 @@
 from bpython import config, repl, cli, autocomplete
 from bpython.test import MagicIterMock, mock, FixLanguageTestCase as TestCase
 
+pypy = 'PyPy' in sys.version
 
 def setup_config(conf):
     config_struct = config.Struct()
@@ -230,21 +233,25 @@ def assert_get_source_error_for_current_function(self, func, msg):
 
     def test_current_function(self):
         self.set_input_line('INPUTLINE')
-        self.repl.current_func = collections.MutableSet.add
-        self.assertIn("Add an element.",
+        self.repl.current_func = inspect.getsource
+        self.assertIn("text of the source code",
                       self.repl.get_source_of_current_name())
 
         self.assert_get_source_error_for_current_function(
-            collections.defaultdict.copy, "No source code found for INPUTLINE")
+            [], "No source code found for INPUTLINE")
 
         self.assert_get_source_error_for_current_function(
-            collections.defaultdict, "could not find class definition")
+            list.pop, "No source code found for INPUTLINE")
 
+    @unittest.skipIf(pypy, 'different errors for PyPy')
+    def test_current_function_cpython(self):
+        self.set_input_line('INPUTLINE')
         self.assert_get_source_error_for_current_function(
-            [], "No source code found for INPUTLINE")
-
+            collections.defaultdict.copy, "No source code found for INPUTLINE")
         self.assert_get_source_error_for_current_function(
-            list.pop, "No source code found for INPUTLINE")
+            collections.defaultdict, "could not find class definition")
+
+
 
     def test_current_line(self):
         self.repl.interp.locals['a'] = socket.socket
