tests: Move heap-realloc-while-locked test from C to Python.

dpgeorge · dpgeorge · commit c607b58efe93 · 2018-03-02T10:59:09.000+11:00
This test for calling gc_realloc() while the GC is locked can be done in
pure Python, so better to do it that way since it can then be tested on
more ports.
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
@@ -169,14 +169,8 @@ STATIC mp_obj_t extra_coverage(void) {
         gc_free(NULL);
         gc_unlock();
 
-        // calling gc_realloc while GC is locked
-        void *p = gc_alloc(4, false);
-        gc_lock();
-        mp_printf(&mp_plat_print, "%p\n", gc_realloc(p, 8, true));
-        gc_unlock();
-
         // using gc_realloc to resize to 0, which means free the memory
-        p = gc_alloc(4, false);
+        void *p = gc_alloc(4, false);
         mp_printf(&mp_plat_print, "%p\n", gc_realloc(p, 0, false));
 
         // calling gc_nbytes with a non-heap pointer
diff --git a/tests/micropython/heap_lock.py b/tests/micropython/heap_lock.py
@@ -2,13 +2,24 @@
 
 import micropython
 
+l = []
+l2 = list(range(100))
+
 micropython.heap_lock()
 
+# general allocation on the heap
 try:
     print([])
 except MemoryError:
     print('MemoryError')
 
+# expansion of a heap block
+try:
+    l.extend(l2)
+except MemoryError:
+    print('MemoryError')
+
 micropython.heap_unlock()
 
+# check that allocation works after an unlock
 print([])
diff --git a/tests/micropython/heap_lock.py.exp b/tests/micropython/heap_lock.py.exp
@@ -1,2 +1,3 @@
 MemoryError
+MemoryError
 []
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
@@ -16,7 +16,6 @@ abc
 # GC
 0
 0
-0
 # vstr
 tests
 sts

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`MemoryError`
	`2`	`+MemoryError`
`2`	`3`	`[]`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ abc`
`16`	`16`	`# GC`
`17`	`17`	`0`
`18`	`18`	`0`
`19`		`-0`
`20`	`19`	`# vstr`
`21`	`20`	`tests`
`22`	`21`	`sts`