Skip to content

Commit 494b45e

Browse files
committed
Altering the tests. Old Python doesn't know newline as keyword argument.
1 parent fcea55e commit 494b45e

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

graalpython/com.oracle.graal.python.test/src/tests/test_binascii.py

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import unittest
77
import binascii
88
import array
9+
import sys
910

1011
class MyInt():
1112
def __init__(self, value):
@@ -22,37 +23,42 @@ def test_b2a_base64_newline(self):
2223
b = self.type2test(b'hello')
2324
self.assertEqual(binascii.b2a_base64(b),
2425
b'aGVsbG8=\n')
25-
self.assertEqual(binascii.b2a_base64(b, newline=True),
26+
if (sys.version_info.major >= 3 and sys.version_info.minor >= 6):
27+
self.assertEqual(binascii.b2a_base64(b, newline=True),
2628
b'aGVsbG8=\n')
27-
self.assertEqual(binascii.b2a_base64(b, newline=False),
29+
self.assertEqual(binascii.b2a_base64(b, newline=False),
2830
b'aGVsbG8=')
2931

3032
def test_b2a_base64_int_newline(self):
3133
b = self.type2test(b'hello')
32-
self.assertEqual(binascii.b2a_base64(b, newline=125),
34+
if (sys.version_info.major >= 3 and sys.version_info.minor >= 6):
35+
self.assertEqual(binascii.b2a_base64(b, newline=125),
3336
b'aGVsbG8=\n')
34-
self.assertEqual(binascii.b2a_base64(b, newline=-10),
37+
self.assertEqual(binascii.b2a_base64(b, newline=-10),
3538
b'aGVsbG8=\n')
36-
self.assertEqual(binascii.b2a_base64(b, newline=0),
39+
self.assertEqual(binascii.b2a_base64(b, newline=0),
3740
b'aGVsbG8=')
3841

3942
def test_b2a_base64_object_newline(self):
4043
b = self.type2test(b'hello')
41-
self.assertEqual(binascii.b2a_base64(b, newline=MyInt(125)),
44+
if (sys.version_info.major >= 3 and sys.version_info.minor >= 6):
45+
self.assertEqual(binascii.b2a_base64(b, newline=MyInt(125)),
4246
b'aGVsbG8=\n')
43-
self.assertEqual(binascii.b2a_base64(b, newline=MyInt(-10)),
47+
self.assertEqual(binascii.b2a_base64(b, newline=MyInt(-10)),
4448
b'aGVsbG8=\n')
45-
self.assertEqual(binascii.b2a_base64(b, newline=MyInt(0)),
49+
self.assertEqual(binascii.b2a_base64(b, newline=MyInt(0)),
4650
b'aGVsbG8=')
4751

4852
def test_b2a_base64_wrong_newline(self):
4953
b = self.type2test(b'hello')
50-
self.assertRaises(TypeError, binascii.b2a_base64, b, newline='ahoj')
54+
if (sys.version_info.major >= 3 and sys.version_info.minor >= 6):
55+
self.assertRaises(TypeError, binascii.b2a_base64, b, newline='ahoj')
5156

5257
def test_b2a_base64_return_type(self):
5358
b = self.type2test(b'hello')
5459
self.assertEqual(type(binascii.b2a_base64(b)), bytes)
55-
self.assertEqual(type(binascii.b2a_base64(b, newline=False)), bytes)
60+
if (sys.version_info.major >= 3 and sys.version_info.minor >= 6):
61+
self.assertEqual(type(binascii.b2a_base64(b, newline=False)), bytes)
5662

5763
class ArrayBinASCIITest(BinASCIITest):
5864
def type2test(self, s):
@@ -69,5 +75,6 @@ class MemoryviewBinASCIITest(BinASCIITest):
6975
class IndependetTest(unittest.TestCase):
7076

7177
def test_b2a_base64_wrong_first_arg(self):
72-
self.assertRaises(TypeError, binascii.b2a_base64, 'Ahoj', newline=True)
73-
self.assertRaises(TypeError, binascii.b2a_base64, 10, newline=True)
78+
if (sys.version_info.major >= 3 and sys.version_info.minor >= 6):
79+
self.assertRaises(TypeError, binascii.b2a_base64, 'Ahoj', newline=True)
80+
self.assertRaises(TypeError, binascii.b2a_base64, 10, newline=True)

0 commit comments

Comments
 (0)