Skip to content

Update tests expectations #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2016
Merged

Update tests expectations #637

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions bpython/test/test_interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,20 @@ def test_traceback(self):
def f():
return 1 / 0

def g():
def gfunc():
return f()

i.runsource('g()')
i.runsource('gfunc()')

if pypy:
global_not_found = "global name 'g' is not defined"
global_not_found = "global name 'gfunc' is not defined"
else:
global_not_found = "name 'g' is not defined"
global_not_found = "name 'gfunc' is not defined"

expected = (
'Traceback (most recent call last):\n File ' +
green('"<input>"') + ', line ' +
bold(magenta('1')) + ', in ' + cyan('<module>') + '\n g()\n' +
bold(magenta('1')) + ', in ' + cyan('<module>') + '\n gfunc()\n' +
bold(red('NameError')) + ': ' + cyan(global_not_found) + '\n')

self.assertMultiLineEqual(str(plain('').join(a)), str(expected))
Expand Down Expand Up @@ -133,19 +133,19 @@ def test_runsource_unicode_autoencode_and_noencode(self):
# for auto and False, run the same tests
for encode in ['auto', False]:
i, a = self.interp_errlog()
i.runsource(u'[1 + 1,\nabc]', encode=encode)
i.runsource(u'[1 + 1,\nabcd]', encode=encode)
self.assertEqual(self.err_lineno(a), 2)

i, a = self.interp_errlog()
i.runsource(u'[1 + 1,\nabc]', encode=encode)
i.runsource(u'[1 + 1,\nabcd]', encode=encode)
self.assertEqual(self.err_lineno(a), 2)

i, a = self.interp_errlog()
i.runsource(u'#encoding: utf-8\nabc', encode=encode)
i.runsource(u'#encoding: utf-8\nabcd', encode=encode)
self.assertEqual(self.err_lineno(a), 2)

i, a = self.interp_errlog()
i.runsource(u'#encoding: utf-8\nabc',
i.runsource(u'#encoding: utf-8\nabcd',
filename='x.py', encode=encode)
self.assertIn('SyntaxError:',
''.join(''.join(remove_ansi(x.__unicode__())
Expand All @@ -164,46 +164,46 @@ def test_runsource_unicode_encode(self):
@unittest.skipIf(py3, "encode only does anything in Python 2")
def test_runsource_bytestring_noencode(self):
i, a = self.interp_errlog()
i.runsource(b'[1 + 1,\nabc]', encode=False)
i.runsource(b'[1 + 1,\nabcd]', encode=False)
self.assertEqual(self.err_lineno(a), 2)

i, a = self.interp_errlog()
i.runsource(b'[1 + 1,\nabc]', filename='x.py', encode=False)
i.runsource(b'[1 + 1,\nabcd]', filename='x.py', encode=False)
self.assertEqual(self.err_lineno(a), 2)

i, a = self.interp_errlog()
i.runsource(dedent(b'''\
#encoding: utf-8

["%s",
abc]''' % (u'åß∂ƒ'.encode('utf8'),)), encode=False)
abcd]''' % (u'åß∂ƒ'.encode('utf8'),)), encode=False)
self.assertEqual(self.err_lineno(a), 4)

i, a = self.interp_errlog()
i.runsource(dedent(b'''\
#encoding: utf-8

["%s",
abc]''' % (u'åß∂ƒ'.encode('utf8'),)),
abcd]''' % (u'åß∂ƒ'.encode('utf8'),)),
filename='x.py', encode=False)
self.assertEqual(self.err_lineno(a), 4)

@unittest.skipIf(py3, "encode only does anything in Python 2")
def test_runsource_bytestring_encode(self):
i, a = self.interp_errlog()
i.runsource(b'[1 + 1,\nabc]', encode=True)
i.runsource(b'[1 + 1,\nabcd]', encode=True)
self.assertEqual(self.err_lineno(a), 2)

i, a = self.interp_errlog()
with self.assertRaises(ValueError):
i.runsource(b'[1 + 1,\nabc]', filename='x.py', encode=True)
i.runsource(b'[1 + 1,\nabcd]', filename='x.py', encode=True)

i, a = self.interp_errlog()
i.runsource(dedent(b'''\
#encoding: utf-8

[u"%s",
abc]''' % (u'åß∂ƒ'.encode('utf8'),)), encode=True)
abcd]''' % (u'åß∂ƒ'.encode('utf8'),)), encode=True)
self.assertEqual(self.err_lineno(a), 4)

i, a = self.interp_errlog()
Expand All @@ -212,32 +212,32 @@ def test_runsource_bytestring_encode(self):
#encoding: utf-8

[u"%s",
abc]''' % (u'åß∂ƒ'.encode('utf8'),)),
abcd]''' % (u'åß∂ƒ'.encode('utf8'),)),
filename='x.py',
encode=True)

@unittest.skipIf(py3, "encode only does anything in Python 2")
def test_runsource_bytestring_autoencode(self):
i, a = self.interp_errlog()
i.runsource(b'[1 + 1,\n abc]')
i.runsource(b'[1 + 1,\n abcd]')
self.assertEqual(self.err_lineno(a), 2)

i, a = self.interp_errlog()
i.runsource(b'[1 + 1,\nabc]', filename='x.py')
i.runsource(b'[1 + 1,\nabcd]', filename='x.py')
self.assertEqual(self.err_lineno(a), 2)

i, a = self.interp_errlog()
i.runsource(dedent(b'''\
#encoding: utf-8

[u"%s",
abc]''' % (u'åß∂ƒ'.encode('utf8'),)))
abcd]''' % (u'åß∂ƒ'.encode('utf8'),)))
self.assertEqual(self.err_lineno(a), 4)

i, a = self.interp_errlog()
i.runsource(dedent(b'''\
#encoding: utf-8

[u"%s",
abc]''' % (u'åß∂ƒ'.encode('utf8'),)))
abcd]''' % (u'åß∂ƒ'.encode('utf8'),)))
self.assertEqual(self.err_lineno(a), 4)