From 2eb88f5df74263cf4b458b135d16a100eb7a8bd2 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 22 Aug 2019 15:45:13 +1000
Subject: [PATCH] tests/extmod: Split json.loads of bytes/bytearray into
 separate test.

Because this functionality was introduced in Python 3.6.
---
 tests/extmod/ujson_loads.py           |  4 ----
 tests/extmod/ujson_loads_bytes.py     | 13 +++++++++++++
 tests/extmod/ujson_loads_bytes.py.exp |  2 ++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 tests/extmod/ujson_loads_bytes.py
 create mode 100644 tests/extmod/ujson_loads_bytes.py.exp

diff --git a/tests/extmod/ujson_loads.py b/tests/extmod/ujson_loads.py
index 43672d650..adba3c068 100644
--- a/tests/extmod/ujson_loads.py
+++ b/tests/extmod/ujson_loads.py
@@ -37,10 +37,6 @@ my_print(json.loads('"abc\\uabcd"'))
 # whitespace handling
 my_print(json.loads('{\n\t"a":[]\r\n, "b":[1], "c":{"3":4}     \n\r\t\r\r\r\n}'))
 
-# loading from bytes and bytearray
-my_print(json.loads(b'[1,2]'))
-my_print(json.loads(bytearray(b'[null]')))
-
 # loading nothing should raise exception
 try:
     json.loads('')
diff --git a/tests/extmod/ujson_loads_bytes.py b/tests/extmod/ujson_loads_bytes.py
new file mode 100644
index 000000000..507e4ca88
--- /dev/null
+++ b/tests/extmod/ujson_loads_bytes.py
@@ -0,0 +1,13 @@
+# test loading from bytes and bytearray (introduced in Python 3.6)
+
+try:
+    import ujson as json
+except ImportError:
+    try:
+        import json
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+print(json.loads(b'[1,2]'))
+print(json.loads(bytearray(b'[null]')))
diff --git a/tests/extmod/ujson_loads_bytes.py.exp b/tests/extmod/ujson_loads_bytes.py.exp
new file mode 100644
index 000000000..c2735a990
--- /dev/null
+++ b/tests/extmod/ujson_loads_bytes.py.exp
@@ -0,0 +1,2 @@
+[1, 2]
+[None]