summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2024-03-18 22:41:28 +1100
committerDamien George <damien@micropython.org>2024-03-19 10:08:32 +1100
commitc9016b4979a718c7a66b2145e00fbdabfa2dc509 (patch)
tree078ef342c6b40b2db05dd83e2569cc4126d6ed49
parentbf18ddd98930787c22b561884e0b3807b47d412b (diff)
tests/basics: Split MicroPython-specific deque tests to separate file.
So that the MicroPython-specific behaviour can be isolated, and the CPython compatible test don't need a .exp file. Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--tests/basics/deque2.py68
-rw-r--r--tests/basics/deque_micropython.py75
-rw-r--r--tests/basics/deque_micropython.py.exp (renamed from tests/basics/deque2.py.exp)11
3 files changed, 76 insertions, 78 deletions
diff --git a/tests/basics/deque2.py b/tests/basics/deque2.py
index 743c04078..3552d5be3 100644
--- a/tests/basics/deque2.py
+++ b/tests/basics/deque2.py
@@ -1,5 +1,3 @@
-# Tests for deques with "check overflow" flag and other extensions
-# wrt to CPython.
try:
from collections import deque
except ImportError:
@@ -43,69 +41,3 @@ try:
d[4] = 0
except IndexError:
print("IndexError")
-
-# Removing elements with del is not supported, fall back on mp_obj_subscr() error message
-try:
- del d[0]
-except TypeError:
- print("TypeError")
-
-
-# Only fixed-size deques are supported, so length arg is mandatory
-try:
- deque(())
-except TypeError:
- print("TypeError")
-
-d = deque((), 2, True)
-
-try:
- d.popleft()
-except IndexError:
- print("IndexError")
-
-try:
- d.pop()
-except IndexError:
- print("IndexError")
-
-print(d.append(1))
-print(d.popleft())
-
-d.append(2)
-print(d.popleft())
-
-d.append(3)
-d.append(4)
-print(d.popleft(), d.popleft())
-try:
- d.popleft()
-except IndexError as e:
- print(repr(e))
-
-try:
- d.pop()
-except IndexError as e:
- print(repr(e))
-
-d.append(5)
-d.append(6)
-print(len(d))
-try:
- d.append(7)
-except IndexError as e:
- print(repr(e))
-
-try:
- d.appendleft(8)
-except IndexError as e:
- print(repr(e))
-
-print(len(d))
-
-print(d.popleft(), d.popleft())
-print(len(d))
-try:
- d.popleft()
-except IndexError as e:
- print(repr(e))
diff --git a/tests/basics/deque_micropython.py b/tests/basics/deque_micropython.py
new file mode 100644
index 000000000..5f32bbc49
--- /dev/null
+++ b/tests/basics/deque_micropython.py
@@ -0,0 +1,75 @@
+# Test MicroPython-specific features of collections.deque.
+
+try:
+ from collections import deque
+except ImportError:
+ print("SKIP")
+ raise SystemExit
+
+
+# Only fixed-size deques are supported, so length arg is mandatory.
+try:
+ deque(())
+except TypeError:
+ print("TypeError")
+
+# Test third argument: flags when True means check for under/overflow
+d = deque((), 2, True)
+
+try:
+ d.popleft()
+except IndexError:
+ print("IndexError")
+
+try:
+ d.pop()
+except IndexError:
+ print("IndexError")
+
+# Removing elements with del is not supported, fallback to
+# mp_obj_subscr() error message.
+try:
+ del d[0]
+except TypeError:
+ print("TypeError")
+
+print(d.append(1))
+print(d.popleft())
+
+d.append(2)
+print(d.popleft())
+
+d.append(3)
+d.append(4)
+print(d.popleft(), d.popleft())
+try:
+ d.popleft()
+except IndexError as e:
+ print(repr(e))
+
+try:
+ d.pop()
+except IndexError as e:
+ print(repr(e))
+
+d.append(5)
+d.append(6)
+print(len(d))
+try:
+ d.append(7)
+except IndexError as e:
+ print(repr(e))
+
+try:
+ d.appendleft(8)
+except IndexError as e:
+ print(repr(e))
+
+print(len(d))
+
+print(d.popleft(), d.popleft())
+print(len(d))
+try:
+ d.popleft()
+except IndexError as e:
+ print(repr(e))
diff --git a/tests/basics/deque2.py.exp b/tests/basics/deque_micropython.py.exp
index 71f74ed6c..f1ff7b77a 100644
--- a/tests/basics/deque2.py.exp
+++ b/tests/basics/deque_micropython.py.exp
@@ -1,16 +1,7 @@
-1
-2
-3
-[3, 4, 5]
-[5, 6, 7]
-0 1 3
-5
-IndexError
-IndexError
-TypeError
TypeError
IndexError
IndexError
+TypeError
None
1
2