diff options
| author | Damien George <damien@micropython.org> | 2024-10-21 12:13:00 +1100 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2024-10-22 14:32:51 +1100 |
| commit | 0646177997b018326ba07cbd2ff1868bc9906881 (patch) | |
| tree | b8fafa63dbcd393f2de3d8b0075e4f02a8c906a8 | |
| parent | f7abb52847415d535a2acc22decbff16e73f2dc3 (diff) | |
| download | micropython-0646177997b018326ba07cbd2ff1868bc9906881.tar.gz micropython-0646177997b018326ba07cbd2ff1868bc9906881.zip | |
tests/extmod: Make invalid-blockdev test work consistently on all ports.
Some ports (eg stm32) configure the FAT driver differently (eg with
multi-partition support) and that leads to a slightly different sequence of
block reads, compared to other configurations (eg rp2).
Comment out the printing in `readblocks()` so the tests are deterministic
(the printing is still useful for debugging).
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | tests/extmod/vfs_blockdev_invalid.py | 2 | ||||
| -rw-r--r-- | tests/extmod/vfs_blockdev_invalid.py.exp | 98 |
2 files changed, 1 insertions, 99 deletions
diff --git a/tests/extmod/vfs_blockdev_invalid.py b/tests/extmod/vfs_blockdev_invalid.py index 9b12746b26..4d00f4b002 100644 --- a/tests/extmod/vfs_blockdev_invalid.py +++ b/tests/extmod/vfs_blockdev_invalid.py @@ -19,7 +19,7 @@ class RAMBlockDevice: self.write_res = 0 def readblocks(self, block, buf, off=0): - print("readblocks") + # print("readblocks", block, len(buf), off) addr = block * self.ERASE_BLOCK_SIZE + off for i in range(len(buf)): buf[i] = self.data[addr + i] diff --git a/tests/extmod/vfs_blockdev_invalid.py.exp b/tests/extmod/vfs_blockdev_invalid.py.exp index 64749da112..13695e0d88 100644 --- a/tests/extmod/vfs_blockdev_invalid.py.exp +++ b/tests/extmod/vfs_blockdev_invalid.py.exp @@ -1,126 +1,28 @@ <class 'VfsLfs2'> -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks opened -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks read 1 a read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -readblocks OSError [Errno 5] EIO -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks read 1 a read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -readblocks OSError [Errno 22] EINVAL -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks read 1 a read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -readblocks OSError [Errno 22] EINVAL -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks read 1 a read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -readblocks OSError [Errno 22] EINVAL -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks -readblocks read 1 a read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <class 'VfsFat'> -readblocks -readblocks -readblocks -readblocks -readblocks opened -readblocks read 1 a read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -readblocks OSError [Errno 5] EIO -readblocks -readblocks OSError [Errno 5] EIO -readblocks OSError [Errno 5] EIO -readblocks -readblocks OSError [Errno 5] EIO -readblocks OSError [Errno 5] EIO -readblocks -readblocks OSError [Errno 5] EIO -readblocks OSError [Errno 5] EIO -readblocks -readblocks OSError [Errno 5] EIO |