Skip to content

Commit cb84398

Browse files
committed
Merge pull request #4186 from Komnomnomnom/ujson-32-bit-tests
TST: fix ujson tests failures on 32-bit
2 parents a2f323f + d74be3c commit cb84398

File tree

1 file changed

+27
-20
lines changed

1 file changed

+27
-20
lines changed

pandas/io/tests/test_json/test_ujson.py

+27-20
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,12 @@ def test_decimalDecodeTest(self):
9696
sut = {u'a': 4.56}
9797
encoded = ujson.encode(sut)
9898
decoded = ujson.decode(encoded)
99-
self.assertNotEqual(sut, decoded)
99+
100+
# Roundtrip works on 32-bit / fails on 64-bit
101+
if sys.maxsize < 2**32:
102+
self.assertEqual(sut, decoded)
103+
else:
104+
self.assertNotEqual(sut, decoded)
100105

101106
def test_decimalDecodeTestPrecise(self):
102107
sut = {u'a': 4.56}
@@ -1396,25 +1401,27 @@ def test_decodeArrayFaultyUnicode(self):
13961401

13971402

13981403
def test_decodeFloatingPointAdditionalTests(self):
1399-
self.assertEquals(-1.1234567893, ujson.loads("-1.1234567893"))
1400-
self.assertEquals(-1.234567893, ujson.loads("-1.234567893"))
1401-
self.assertEquals(-1.34567893, ujson.loads("-1.34567893"))
1402-
self.assertEquals(-1.4567893, ujson.loads("-1.4567893"))
1403-
self.assertEquals(-1.567893, ujson.loads("-1.567893"))
1404-
self.assertEquals(-1.67893, ujson.loads("-1.67893"))
1405-
self.assertEquals(-1.7893, ujson.loads("-1.7893"))
1406-
self.assertEquals(-1.893, ujson.loads("-1.893"))
1407-
self.assertEquals(-1.3, ujson.loads("-1.3"))
1408-
1409-
self.assertEquals(1.1234567893, ujson.loads("1.1234567893"))
1410-
self.assertEquals(1.234567893, ujson.loads("1.234567893"))
1411-
self.assertEquals(1.34567893, ujson.loads("1.34567893"))
1412-
self.assertEquals(1.4567893, ujson.loads("1.4567893"))
1413-
self.assertEquals(1.567893, ujson.loads("1.567893"))
1414-
self.assertEquals(1.67893, ujson.loads("1.67893"))
1415-
self.assertEquals(1.7893, ujson.loads("1.7893"))
1416-
self.assertEquals(1.893, ujson.loads("1.893"))
1417-
self.assertEquals(1.3, ujson.loads("1.3"))
1404+
places = 15
1405+
1406+
self.assertAlmostEquals(-1.1234567893, ujson.loads("-1.1234567893"), places=places)
1407+
self.assertAlmostEquals(-1.234567893, ujson.loads("-1.234567893"), places=places)
1408+
self.assertAlmostEquals(-1.34567893, ujson.loads("-1.34567893"), places=places)
1409+
self.assertAlmostEquals(-1.4567893, ujson.loads("-1.4567893"), places=places)
1410+
self.assertAlmostEquals(-1.567893, ujson.loads("-1.567893"), places=places)
1411+
self.assertAlmostEquals(-1.67893, ujson.loads("-1.67893"), places=places)
1412+
self.assertAlmostEquals(-1.7893, ujson.loads("-1.7893"), places=places)
1413+
self.assertAlmostEquals(-1.893, ujson.loads("-1.893"), places=places)
1414+
self.assertAlmostEquals(-1.3, ujson.loads("-1.3"), places=places)
1415+
1416+
self.assertAlmostEquals(1.1234567893, ujson.loads("1.1234567893"), places=places)
1417+
self.assertAlmostEquals(1.234567893, ujson.loads("1.234567893"), places=places)
1418+
self.assertAlmostEquals(1.34567893, ujson.loads("1.34567893"), places=places)
1419+
self.assertAlmostEquals(1.4567893, ujson.loads("1.4567893"), places=places)
1420+
self.assertAlmostEquals(1.567893, ujson.loads("1.567893"), places=places)
1421+
self.assertAlmostEquals(1.67893, ujson.loads("1.67893"), places=places)
1422+
self.assertAlmostEquals(1.7893, ujson.loads("1.7893"), places=places)
1423+
self.assertAlmostEquals(1.893, ujson.loads("1.893"), places=places)
1424+
self.assertAlmostEquals(1.3, ujson.loads("1.3"), places=places)
14181425

14191426
def test_encodeBigSet(self):
14201427
s = set()

0 commit comments

Comments
 (0)