Skip to content

Commit 5ef0d2a

Browse files
committed
tests/extmod: Remove conditional import of uos_vfs, it no longer exists.
This conditional import was only used to get the tests working on the unix coverage build, which has now switched to use VFS by default so the uos module alone has the required functionality.
1 parent 6c02da2 commit 5ef0d2a

6 files changed

Lines changed: 6 additions & 28 deletions

File tree

tests/extmod/vfs_basic.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
# test VFS functionality without any particular filesystem type
22

33
try:
4-
try:
5-
import uos_vfs as uos
6-
open = uos.vfs_open
7-
except ImportError:
8-
import uos
4+
import uos
95
uos.mount
106
except (ImportError, AttributeError):
117
print("SKIP")

tests/extmod/vfs_fat_fileio1.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
try:
22
import uerrno
3-
try:
4-
import uos_vfs as uos
5-
open = uos.vfs_open
6-
except ImportError:
7-
import uos
3+
import uos
84
except ImportError:
95
print("SKIP")
106
raise SystemExit

tests/extmod/vfs_fat_fileio2.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
try:
22
import uerrno
3-
try:
4-
import uos_vfs as uos
5-
open = uos.vfs_open
6-
except ImportError:
7-
import uos
3+
import uos
84
except ImportError:
95
print("SKIP")
106
raise SystemExit

tests/extmod/vfs_fat_more.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import uerrno
22
try:
3-
try:
4-
import uos_vfs as uos
5-
open = uos.vfs_open
6-
except ImportError:
7-
import uos
3+
import uos
84
except ImportError:
95
print("SKIP")
106
raise SystemExit

tests/extmod/vfs_fat_oldproto.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
try:
22
import uerrno
3-
try:
4-
import uos_vfs as uos
5-
except ImportError:
6-
import uos
3+
import uos
74
except ImportError:
85
print("SKIP")
96
raise SystemExit

tests/extmod/vfs_fat_ramdisk.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
try:
22
import uerrno
3-
try:
4-
import uos_vfs as uos
5-
except ImportError:
6-
import uos
3+
import uos
74
except ImportError:
85
print("SKIP")
96
raise SystemExit

0 commit comments

Comments
 (0)