From 5ef0d2ab14e7a1a367695e1bb64300f57871d9a3 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 6 Jun 2018 13:24:09 +1000
Subject: [PATCH] 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.
---
 tests/extmod/vfs_basic.py        | 6 +-----
 tests/extmod/vfs_fat_fileio1.py  | 6 +-----
 tests/extmod/vfs_fat_fileio2.py  | 6 +-----
 tests/extmod/vfs_fat_more.py     | 6 +-----
 tests/extmod/vfs_fat_oldproto.py | 5 +----
 tests/extmod/vfs_fat_ramdisk.py  | 5 +----
 6 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/tests/extmod/vfs_basic.py b/tests/extmod/vfs_basic.py
index 4fc67d34b2..fbcc92bade 100644
--- a/tests/extmod/vfs_basic.py
+++ b/tests/extmod/vfs_basic.py
@@ -1,11 +1,7 @@
 # test VFS functionality without any particular filesystem type
 
 try:
-    try:
-        import uos_vfs as uos
-        open = uos.vfs_open
-    except ImportError:
-        import uos
+    import uos
     uos.mount
 except (ImportError, AttributeError):
     print("SKIP")
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
index f1f4639ab7..51cd765222 100644
--- a/tests/extmod/vfs_fat_fileio1.py
+++ b/tests/extmod/vfs_fat_fileio1.py
@@ -1,10 +1,6 @@
 try:
     import uerrno
-    try:
-        import uos_vfs as uos
-        open = uos.vfs_open
-    except ImportError:
-        import uos
+    import uos
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index b5adb75c96..9b9a11e435 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -1,10 +1,6 @@
 try:
     import uerrno
-    try:
-        import uos_vfs as uos
-        open = uos.vfs_open
-    except ImportError:
-        import uos
+    import uos
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/vfs_fat_more.py b/tests/extmod/vfs_fat_more.py
index ae340dde8f..4384e55cba 100644
--- a/tests/extmod/vfs_fat_more.py
+++ b/tests/extmod/vfs_fat_more.py
@@ -1,10 +1,6 @@
 import uerrno
 try:
-    try:
-        import uos_vfs as uos
-        open = uos.vfs_open
-    except ImportError:
-        import uos
+    import uos
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/vfs_fat_oldproto.py b/tests/extmod/vfs_fat_oldproto.py
index ef4f1da78e..3caaa368db 100644
--- a/tests/extmod/vfs_fat_oldproto.py
+++ b/tests/extmod/vfs_fat_oldproto.py
@@ -1,9 +1,6 @@
 try:
     import uerrno
-    try:
-        import uos_vfs as uos
-    except ImportError:
-        import uos
+    import uos
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 801c697862..f6e5c64df0 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -1,9 +1,6 @@
 try:
     import uerrno
-    try:
-        import uos_vfs as uos
-    except ImportError:
-        import uos
+    import uos
 except ImportError:
     print("SKIP")
     raise SystemExit