tests/extmod: Skip vfs tests if target doesn't have enough memory.

Signed-off-by: Damien George <damien@micropython.org>
micropython · Feb 9, 2023 · d99ebb3 · d99ebb3
1 parent b1123a5
commit d99ebb3
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
@@ -38,11 +38,11 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
+    uos.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-uos.VfsFat.mkfs(bdev)
 vfs = uos.VfsFat(bdev)
 uos.mount(vfs, "/ramdisk")
 uos.chdir("/ramdisk")

diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
@@ -38,11 +38,11 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
+    uos.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-uos.VfsFat.mkfs(bdev)
 vfs = uos.VfsFat(bdev)
 uos.mount(vfs, "/ramdisk")
 uos.chdir("/ramdisk")

diff --git a/tests/extmod/vfs_fat_ilistdir_del.py b/tests/extmod/vfs_fat_ilistdir_del.py
@@ -71,5 +71,10 @@ def test(bdev, vfs_class):
         vfs.open("/test", "w").close()
 
 
-bdev = RAMBlockDevice(30)
+try:
+    bdev = RAMBlockDevice(30)
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
 test(bdev, uos.VfsFat)
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
@@ -38,12 +38,11 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
+    uos.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-uos.VfsFat.mkfs(bdev)
-
 print(b"FOO_FILETXT" not in bdev.data)
 print(b"hello!" not in bdev.data)
 

diff --git a/tests/extmod/vfs_lfs_mtime.py b/tests/extmod/vfs_lfs_mtime.py
@@ -101,5 +101,10 @@ def test(bdev, vfs_class):
     vfs.umount()
 
 
-bdev = RAMBlockDevice(30)
+try:
+    bdev = RAMBlockDevice(30)
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
 test(bdev, uos.VfsLfs2)