tests: Use vfs module instead of os.

Signed-off-by: Damien George <[email protected]>

Author: dpgeorge

tests/extmod/vfs_basic.py

@@ -1,10 +1,8 @@
 # test VFS functionality without any particular filesystem type
 
 try:
-    import os
-
-    os.mount
-except (ImportError, AttributeError):
+    import os, vfs
+except ImportError:
     print("SKIP")
     raise SystemExit
 
@@ -59,11 +57,11 @@ def open(self, file, mode):
 
 # first we umount any existing mount points the target may have
 try:
-    os.umount("/")
+    vfs.umount("/")
 except OSError:
     pass
 for path in os.listdir("/"):
-    os.umount("/" + path)
+    vfs.umount("/" + path)
 
 # stat root dir
 print(os.stat("/"))
@@ -83,7 +81,7 @@ def open(self, file, mode):
             print(func, arg, "OSError")
 
 # basic mounting and listdir
-os.mount(Filesystem(1), "/test_mnt")
+vfs.mount(Filesystem(1), "/test_mnt")
 print(os.listdir())
 
 # ilistdir
@@ -103,13 +101,13 @@ def open(self, file, mode):
 print(os.listdir("/test_mnt"))
 
 # mounting another filesystem
-os.mount(Filesystem(2), "/test_mnt2", readonly=True)
+vfs.mount(Filesystem(2), "/test_mnt2", readonly=True)
 print(os.listdir())
 print(os.listdir("/test_mnt2"))
 
 # mounting over an existing mount point
 try:
-    os.mount(Filesystem(3), "/test_mnt2")
+    vfs.mount(Filesystem(3), "/test_mnt2")
 except OSError:
     print("OSError")
 
@@ -139,23 +137,23 @@ def open(self, file, mode):
 open("test_file", "wb")
 
 # umount
-os.umount("/test_mnt")
-os.umount("/test_mnt2")
+vfs.umount("/test_mnt")
+vfs.umount("/test_mnt2")
 
 # umount a non-existent mount point
 try:
-    os.umount("/test_mnt")
+    vfs.umount("/test_mnt")
 except OSError:
     print("OSError")
 
 # root dir
-os.mount(Filesystem(3), "/")
+vfs.mount(Filesystem(3), "/")
 print(os.stat("/"))
 print(os.statvfs("/"))
 print(os.listdir())
 open("test")
 
-os.mount(Filesystem(4), "/mnt")
+vfs.mount(Filesystem(4), "/mnt")
 print(os.listdir())
 print(os.listdir("/mnt"))
 os.chdir("/mnt")
@@ -166,9 +164,9 @@ def open(self, file, mode):
 print(os.listdir())
 os.chdir("/")
 
-os.umount("/")
+vfs.umount("/")
 print(os.listdir("/"))
-os.umount("/mnt")
+vfs.umount("/mnt")
 
 # chdir to a non-existent mount point (current directory should remain unchanged)
 try:
@@ -178,7 +176,7 @@ def open(self, file, mode):
 print(os.getcwd())
 
 # chdir to a non-existent subdirectory in a mounted filesystem
-os.mount(Filesystem(5, 1), "/mnt")
+vfs.mount(Filesystem(5, 1), "/mnt")
 try:
     os.chdir("/mnt/subdir")
 except OSError:

tests/extmod/vfs_blockdev.py

@@ -1,10 +1,10 @@
 # Test for behaviour of combined standard and extended block device
 
 try:
-    import os
+    import vfs
 
-    os.VfsFat
-    os.VfsLfs2
+    vfs.VfsFat
+    vfs.VfsLfs2
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -65,12 +65,10 @@ def test(bdev, vfs_class):
 
 
 try:
-    import os
-
     bdev = RAMBlockDevice(50)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-test(bdev, os.VfsFat)
-test(bdev, os.VfsLfs2)
+test(bdev, vfs.VfsFat)
+test(bdev, vfs.VfsLfs2)

tests/extmod/vfs_fat_fileio1.py

@@ -1,13 +1,8 @@
 try:
-    import errno
-    import os
-except ImportError:
-    print("SKIP")
-    raise SystemExit
+    import errno, os, vfs
 
-try:
-    os.VfsFat
-except AttributeError:
+    vfs.VfsFat
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
@@ -38,13 +33,13 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
-    os.VfsFat.mkfs(bdev)
+    vfs.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-vfs = os.VfsFat(bdev)
-os.mount(vfs, "/ramdisk")
+fs = vfs.VfsFat(bdev)
+vfs.mount(fs, "/ramdisk")
 os.chdir("/ramdisk")
 
 # file IO
@@ -99,12 +94,12 @@ def ioctl(self, op, arg):
 #    print(f.read())
 
 # dirs
-vfs.mkdir("foo_dir")
+fs.mkdir("foo_dir")
 
 try:
-    vfs.rmdir("foo_file.txt")
+    fs.rmdir("foo_file.txt")
 except OSError as e:
     print(e.errno == 20)  # errno.ENOTDIR
 
-vfs.remove("foo_file.txt")
-print(list(vfs.ilistdir()))
+fs.remove("foo_file.txt")
+print(list(fs.ilistdir()))

tests/extmod/vfs_fat_fileio2.py

@@ -1,13 +1,8 @@
 try:
-    import errno
-    import os
-except ImportError:
-    print("SKIP")
-    raise SystemExit
+    import errno, os, vfs
 
-try:
-    os.VfsFat
-except AttributeError:
+    vfs.VfsFat
+except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
@@ -38,32 +33,32 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
-    os.VfsFat.mkfs(bdev)
+    vfs.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-vfs = os.VfsFat(bdev)
-os.mount(vfs, "/ramdisk")
+fs = vfs.VfsFat(bdev)
+vfs.mount(fs, "/ramdisk")
 os.chdir("/ramdisk")
 
 try:
-    vfs.mkdir("foo_dir")
+    fs.mkdir("foo_dir")
 except OSError as e:
     print(e.errno == errno.EEXIST)
 
 try:
-    vfs.remove("foo_dir")
+    fs.remove("foo_dir")
 except OSError as e:
     print(e.errno == errno.EISDIR)
 
 try:
-    vfs.remove("no_file.txt")
+    fs.remove("no_file.txt")
 except OSError as e:
     print(e.errno == errno.ENOENT)
 
 try:
-    vfs.rename("foo_dir", "/null/file")
+    fs.rename("foo_dir", "/null/file")
 except OSError as e:
     print(e.errno == errno.ENOENT)
 
@@ -79,34 +74,34 @@ def ioctl(self, op, arg):
 
 # directory not empty
 try:
-    vfs.rmdir("foo_dir")
+    fs.rmdir("foo_dir")
 except OSError as e:
     print(e.errno == errno.EACCES)
 
 # trim full path
-vfs.rename("foo_dir/file-in-dir.txt", "foo_dir/file.txt")
-print(list(vfs.ilistdir("foo_dir")))
+fs.rename("foo_dir/file-in-dir.txt", "foo_dir/file.txt")
+print(list(fs.ilistdir("foo_dir")))
 
-vfs.rename("foo_dir/file.txt", "moved-to-root.txt")
-print(list(vfs.ilistdir()))
+fs.rename("foo_dir/file.txt", "moved-to-root.txt")
+print(list(fs.ilistdir()))
 
 # check that renaming to existing file will overwrite it
 with open("temp", "w") as f:
     f.write("new text")
-vfs.rename("temp", "moved-to-root.txt")
-print(list(vfs.ilistdir()))
+fs.rename("temp", "moved-to-root.txt")
+print(list(fs.ilistdir()))
 with open("moved-to-root.txt") as f:
     print(f.read())
 
 # valid removes
-vfs.remove("foo_dir/sub_file.txt")
-vfs.rmdir("foo_dir")
-print(list(vfs.ilistdir()))
+fs.remove("foo_dir/sub_file.txt")
+fs.rmdir("foo_dir")
+print(list(fs.ilistdir()))
 
 # disk full
 try:
-    bsize = vfs.statvfs("/ramdisk")[0]
-    free = vfs.statvfs("/ramdisk")[2] + 1
+    bsize = fs.statvfs("/ramdisk")[0]
+    free = fs.statvfs("/ramdisk")[2] + 1
     f = open("large_file.txt", "wb")
     f.write(bytearray(bsize * free))
 except OSError as e:

tests/extmod/vfs_fat_finaliser.py

@@ -1,9 +1,9 @@
 # Test VfsFat class and its finaliser
 
 try:
-    import errno, os
+    import errno, os, vfs
 
-    os.VfsFat
+    vfs.VfsFat
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -39,8 +39,8 @@ def ioctl(self, op, arg):
     raise SystemExit
 
 # Format block device and create VFS object
-os.VfsFat.mkfs(bdev)
-vfs = os.VfsFat(bdev)
+vfs.VfsFat.mkfs(bdev)
+fs = vfs.VfsFat(bdev)
 
 # Here we test that opening a file with the heap locked fails correctly.  This
 # is a special case because file objects use a finaliser and allocating with a
@@ -52,7 +52,7 @@ def ioctl(self, op, arg):
 try:
     import errno, os
 
-    vfs.open("x", "r")
+    fs.open("x", "r")
 except MemoryError:
     print("MemoryError")
 micropython.heap_unlock()
@@ -77,10 +77,10 @@ def ioctl(self, op, arg):
 # Only read back N-1 files because the last one may not be finalised due to
 # references to it being left on the C stack.
 for n in names:
-    f = vfs.open(n, "w")
+    f = fs.open(n, "w")
     f.write(n)
     f = None  # release f without closing
 gc.collect()  # should finalise at least the first N-1 files by closing them
 for n in names[:-1]:
-    with vfs.open(n, "r") as f:
+    with fs.open(n, "r") as f:
         print(f.read())

tests/extmod/vfs_fat_ilistdir_del.py

@@ -2,9 +2,9 @@
 import gc
 
 try:
-    import os
+    import os, vfs
 
-    os.VfsFat
+    vfs.VfsFat
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
@@ -37,29 +37,29 @@ def ioctl(self, op, arg):
 
 def test(bdev, vfs_class):
     vfs_class.mkfs(bdev)
-    vfs = vfs_class(bdev)
-    vfs.mkdir("/test_d1")
-    vfs.mkdir("/test_d2")
-    vfs.mkdir("/test_d3")
+    fs = vfs_class(bdev)
+    fs.mkdir("/test_d1")
+    fs.mkdir("/test_d2")
+    fs.mkdir("/test_d3")
 
     for i in range(10):
         print(i)
 
         # We want to partially iterate the ilistdir iterator to leave it in an
         # open state, which will then test the finaliser when it's garbage collected.
-        idir = vfs.ilistdir("/")
+        idir = fs.ilistdir("/")
         print(any(idir))
 
         # Alternate way of partially iterating the ilistdir object, modifying the
         # filesystem while it's open.
-        for dname, *_ in vfs.ilistdir("/"):
-            vfs.rmdir(dname)
+        for dname, *_ in fs.ilistdir("/"):
+            fs.rmdir(dname)
             break
-        vfs.mkdir(dname)
+        fs.mkdir(dname)
 
         # Also create a fully drained iterator and ensure trying to reuse it
         # throws the correct exception.
-        idir_emptied = vfs.ilistdir("/")
+        idir_emptied = fs.ilistdir("/")
         l = list(idir_emptied)
         print(len(l))
         try:
@@ -68,7 +68,7 @@ def test(bdev, vfs_class):
             pass
 
         gc.collect()
-        vfs.open("/test", "w").close()
+        fs.open("/test", "w").close()
 
 
 try:
@@ -77,4 +77,4 @@ def test(bdev, vfs_class):
     print("SKIP")
     raise SystemExit
 
-test(bdev, os.VfsFat)
+test(bdev, vfs.VfsFat)