tests: Skip tests needing machine module if (u)machine doesn't exist.

tests/basics/subclass_native_call.py

@@ -4,13 +4,13 @@
 # and is callable (has call).  The only one available is machine.Signal, which
 # in turns needs PinBase.
 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
 

tests/extmod/machine_pinbase.py

 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
 

tests/extmod/machine_pulse.py

 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
 

tests/extmod/machine_signal.py

 # 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