8000 tests/extmod: Make invalid-blockdev test work consistently on all ports. · micropython/micropython@0646177 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0646177

Browse files
dpgeorgedpgeorge
committed
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>
1 parent f7abb52 commit 0646177

File tree

2 files changed

+1
-99
lines changed

2 files changed

+1
-99
lines changed

‎tests/extmod/vfs_blockdev_invalid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self, blocks):
1919
self.write_res = 0
2020

2121
def readblocks(self, block, buf, off=0):
22-
print("readblocks")
22+
# print 10000 ("readblocks", block, len(buf), off)
2323
addr = block * self.ERASE_BLOCK_SIZE + off
2424
for i in range(len(buf)):
2525
buf[i] = self.data[addr + i]

‎tests/extmod/vfs_blockdev_invalid.py.exp

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,28 @@
11
<class 'VfsLfs2'>
2-
readblocks
3-
readblocks
4-
readblocks
5-
readblocks
6-
readblocks
7-
readblocks
8-
readblocks
9-
readblocks
10-
readblocks
11-
readblocks
12-
readblocks
13-
readblocks
14-
readblocks
15-
readblocks
16-
readblocks
17-
readblocks
18-
readblocks
19-
readblocks
20-
readblocks
21-
readblocks
22-
readblocks
23-
readblocks
24-
readblocks
25-
readblocks
26-
readblocks
27-
readblocks
28-
readblocks
29-
readblocks
30-
readblocks
31-
readblocks
322
opened
33-
readblocks
34-
readblocks
35-
readblocks
36-
readblocks
37-
readblocks
38-
readblocks
39-
readblocks
40-
readblocks
41-
readblocks
42-
readblocks
433
read 1 a
444
read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
45-
readblocks
465
OSError [Errno 5] EIO
47-
readblocks
48-
readblocks
49-
readblocks
50-
readblocks
51-
readblocks
52-
readblocks
53-
readblocks
54-
readblocks
55-
readblocks
566
read 1 a
577
read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
58-
readblocks
598
OSError [Errno 22] EINVAL
60-
readblocks
61-
readblocks
62-
readblocks
63-
readblocks
64-
readblocks
65-
readblocks
66-
readblocks
67-
readblocks
68-
readblocks
699
read 1 a
7010
read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
71-
readblocks
7211
OSError [Errno 22] EINVAL
73-
readblocks
74-
readblocks
75-
readblocks
76-
readblocks
77-
readblocks
78-
readblocks
79-
readblocks
80-
readblocks
81-
readblocks
8212
read 1 a
8313
read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
84-
readblocks
8514
OSError [Errno 22] EINVAL
86-
readblocks
87-
readblocks
88-
readblocks
89-
readblocks
90-
readblocks
91-
readblocks
92-
readblocks
93-
readblocks
94-
readblocks
9515
read 1 a
9616
read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
9717
<class 'VfsFat'>
98-
readblocks
99-
readblocks
100-
readblocks
101-
readblocks
102-
readblocks
10318
opened
104-
readblocks
10519
read 1 a
10620
read rest aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
107-
readblocks
10821
OSError [Errno 5] EIO
109-
readblocks
110-
readblocks
11122
OSEr 6302 ror [Errno 5] EIO
112-
readblocks
11323
OSError [Errno 5] EIO
114-
readblocks
115-
readblocks
11624
OSError [Errno 5] EIO
117-
readblocks
11825
OSError [Errno 5] EIO
119-
readblocks
120-
readblocks
12126
OSError [Errno 5] EIO
122-
readblocks
12327
OSError [Errno 5] EIO
124-
readblocks
125-
readblocks
12628
OSError [Errno 5] EIO

0 commit comments

Comments
 (0)
0