From ca39ea7cef802497834aa2a0afa0ef8cae9ab800 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Sun, 28 Apr 2019 22:12:17 +1000
Subject: tests: Skip tests needing machine module if (u)machine doesn't exist.

---
 tests/extmod/machine_pinbase.py | 10 +++++-----
 tests/extmod/machine_pulse.py   | 10 +++++-----
 tests/extmod/machine_signal.py  | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'tests/extmod')

diff --git a/tests/extmod/machine_pinbase.py b/tests/extmod/machine_pinbase.py
index e91775504..45aa4d8b5 100644
--- a/tests/extmod/machine_pinbase.py
+++ b/tests/extmod/machine_pinbase.py
@@ -1,10 +1,10 @@
 try:
-    import umachine as machine
-except ImportError:
-    import machine
-try:
+    try:
+        import umachine as machine
+    except ImportError:
+        import machine
     machine.PinBase
-except AttributeError:
+except:
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/machine_pulse.py b/tests/extmod/machine_pulse.py
index d525974e0..458fe09a1 100644
--- a/tests/extmod/machine_pulse.py
+++ b/tests/extmod/machine_pulse.py
@@ -1,11 +1,11 @@
 try:
-    import umachine as machine
-except ImportError:
-    import machine
-try:
+    try:
+        import umachine as machine
+    except ImportError:
+        import machine
     machine.PinBase
     machine.time_pulse_us
-except AttributeError:
+except:
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/machine_signal.py b/tests/extmod/machine_signal.py
index 53f4f5890..dcc0de1a5 100644
--- a/tests/extmod/machine_signal.py
+++ b/tests/extmod/machine_signal.py
@@ -1,13 +1,13 @@
 # test machine.Signal class
 
 try:
-    import umachine as machine
-except ImportError:
-    import machine
-try:
+    try:
+        import umachine as machine
+    except ImportError:
+        import machine
     machine.PinBase
     machine.Signal
-except AttributeError:
+except:
     print("SKIP")
     raise SystemExit
 
-- 
cgit v1.2.3