From 499ea8b2532010c17b2f52825b90c4991db02aa5 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 3 Apr 2017 00:14:57 +0300 Subject: [PATCH] tests/extmod/vfs_fat_fileio*: Improve skippability. Should be skipped on missing uso, uerrno modules. --- tests/extmod/vfs_fat_fileio1.py | 13 +++++++++---- tests/extmod/vfs_fat_fileio2.py | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py index 322f6831ed..526b3f5c1b 100644 --- a/tests/extmod/vfs_fat_fileio1.py +++ b/tests/extmod/vfs_fat_fileio1.py @@ -1,10 +1,15 @@ import sys -import uerrno try: - import uos_vfs as uos - open = uos.vfs_open + import uerrno + try: + import uos_vfs as uos + open = uos.vfs_open + except ImportError: + import uos except ImportError: - import uos + print("SKIP") + sys.exit() + try: uos.VfsFat except AttributeError: diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py index 80a614db75..111abfa7ea 100644 --- a/tests/extmod/vfs_fat_fileio2.py +++ b/tests/extmod/vfs_fat_fileio2.py @@ -1,10 +1,15 @@ import sys -import uerrno try: - import uos_vfs as uos - open = uos.vfs_open + import uerrno + try: + import uos_vfs as uos + open = uos.vfs_open + except ImportError: + import uos except ImportError: - import uos + print("SKIP") + sys.exit() + try: uos.VfsFat except AttributeError: