tests/extmod: Add test to try and mount a block device directly.
Mounting a bdev directly tries to auto-detect the filesystem and if none is found an OSError(19,) should be raised. The fourth parameter of readblocks() and writeblocks() must be optional to support ports with MICROPY_VFS_FAT=1. Otherwise mounting a bdev may fail because looking for a FATFS will call readblocks() with only 3 parameters.
This commit is contained in:
parent
1719459c28
commit
dc1fd4df73
@ -16,12 +16,12 @@ class RAMBlockDevice:
|
|||||||
def __init__(self, blocks):
|
def __init__(self, blocks):
|
||||||
self.data = bytearray(blocks * self.ERASE_BLOCK_SIZE)
|
self.data = bytearray(blocks * self.ERASE_BLOCK_SIZE)
|
||||||
|
|
||||||
def readblocks(self, block, buf, off):
|
def readblocks(self, block, buf, off=0):
|
||||||
addr = block * self.ERASE_BLOCK_SIZE + off
|
addr = block * self.ERASE_BLOCK_SIZE + off
|
||||||
for i in range(len(buf)):
|
for i in range(len(buf)):
|
||||||
buf[i] = self.data[addr + i]
|
buf[i] = self.data[addr + i]
|
||||||
|
|
||||||
def writeblocks(self, block, buf, off):
|
def writeblocks(self, block, buf, off=0):
|
||||||
addr = block * self.ERASE_BLOCK_SIZE + off
|
addr = block * self.ERASE_BLOCK_SIZE + off
|
||||||
for i in range(len(buf)):
|
for i in range(len(buf)):
|
||||||
self.data[addr + i] = buf[i]
|
self.data[addr + i] = buf[i]
|
||||||
@ -35,9 +35,17 @@ class RAMBlockDevice:
|
|||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
def test(bdev, vfs_class):
|
def test(vfs_class):
|
||||||
print("test", vfs_class)
|
print("test", vfs_class)
|
||||||
|
|
||||||
|
bdev = RAMBlockDevice(30)
|
||||||
|
|
||||||
|
# mount bdev unformatted
|
||||||
|
try:
|
||||||
|
uos.mount(bdev, "/lfs")
|
||||||
|
except Exception as er:
|
||||||
|
print(repr(er))
|
||||||
|
|
||||||
# mkfs
|
# mkfs
|
||||||
vfs_class.mkfs(bdev)
|
vfs_class.mkfs(bdev)
|
||||||
|
|
||||||
@ -84,12 +92,16 @@ def test(bdev, vfs_class):
|
|||||||
# umount
|
# umount
|
||||||
uos.umount("/lfs")
|
uos.umount("/lfs")
|
||||||
|
|
||||||
|
# mount bdev again
|
||||||
|
uos.mount(bdev, "/lfs")
|
||||||
|
|
||||||
|
# umount
|
||||||
|
uos.umount("/lfs")
|
||||||
|
|
||||||
# clear imported modules
|
# clear imported modules
|
||||||
usys.modules.clear()
|
usys.modules.clear()
|
||||||
|
|
||||||
|
|
||||||
bdev = RAMBlockDevice(30)
|
|
||||||
|
|
||||||
# initialise path
|
# initialise path
|
||||||
import usys
|
import usys
|
||||||
|
|
||||||
@ -98,5 +110,5 @@ usys.path.append("/lfs")
|
|||||||
usys.path.append("")
|
usys.path.append("")
|
||||||
|
|
||||||
# run tests
|
# run tests
|
||||||
test(bdev, uos.VfsLfs1)
|
test(uos.VfsLfs1)
|
||||||
test(bdev, uos.VfsLfs2)
|
test(uos.VfsLfs2)
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
test <class 'VfsLfs1'>
|
test <class 'VfsLfs1'>
|
||||||
|
OSError(19,)
|
||||||
hello from lfs
|
hello from lfs
|
||||||
package
|
package
|
||||||
hello from lfs
|
hello from lfs
|
||||||
@ -6,6 +7,7 @@ lfsmod2.py: print("hello from lfs")
|
|||||||
|
|
||||||
OSError(30,)
|
OSError(30,)
|
||||||
test <class 'VfsLfs2'>
|
test <class 'VfsLfs2'>
|
||||||
|
OSError(19,)
|
||||||
hello from lfs
|
hello from lfs
|
||||||
package
|
package
|
||||||
hello from lfs
|
hello from lfs
|
||||||
|
Loading…
Reference in New Issue
Block a user