Merge branch 'main' into patch-1

68 files changed, 243 insertions, 652 deletions

diff --git a/tests/basics/assign1.py b/tests/basics/assign1.py
index 118747f74..01047fa92 100644
--- a/tests/basics/assign1.py
+++ b/tests/basics/assign1.py
@@ -8,4 +8,3 @@ print(a, b)
 
 a = b = c = 3
 print(a, b, c)
-
diff --git a/tests/basics/builtin_chr.py b/tests/basics/builtin_chr.py
index 02d783ae6..c1a9f7053 100644
--- a/tests/basics/builtin_chr.py
+++ b/tests/basics/builtin_chr.py
@@ -6,4 +6,3 @@ try:
     chr(0x110000)
 except ValueError:
     print("ValueError")
-
diff --git a/tests/basics/dict1.py b/tests/basics/dict1.py
index 20fa9def3..0cec51173 100644
--- a/tests/basics/dict1.py
+++ b/tests/basics/dict1.py
@@ -27,7 +27,7 @@ print({1:1} == {2:1})
 try:
     {}[0]
 except KeyError as er:
-    print('KeyError', er, repr(er), er.args)
+    print('KeyError', er, er.args)
 
 # unsupported unary op
 try:
diff --git a/tests/basics/dict_popitem.py b/tests/basics/dict_popitem.py
index e37bcec19..0e3384253 100644
--- a/tests/basics/dict_popitem.py
+++ b/tests/basics/dict_popitem.py
@@ -13,4 +13,3 @@ except KeyError:
 else:
     print("Did not raise KeyError")
 print(sorted(els))
-
diff --git a/tests/basics/dict_setdefault.py b/tests/basics/dict_setdefault.py
index 57d0ba451..87de5b3af 100644
--- a/tests/basics/dict_setdefault.py
+++ b/tests/basics/dict_setdefault.py
@@ -9,5 +9,3 @@ d.pop(5)
 print(d.setdefault(5, 1))
 print(d[1])
 print(d[5])
-
-
diff --git a/tests/basics/exception1.py b/tests/basics/exception1.py
index 739dd3275..d83764cb9 100644
--- a/tests/basics/exception1.py
+++ b/tests/basics/exception1.py
@@ -1,7 +1,6 @@
 print(repr(IndexError()))
 print(str(IndexError()))
 
-print(repr(IndexError("foo")))
 print(str(IndexError("foo")))
 
 a = IndexError(1, "test", [100, 200])
diff --git a/tests/basics/gen_yield_from.py.exp b/tests/basics/gen_yield_from.py.exp
new file mode 100644
index 000000000..507f2b9ca
--- /dev/null
+++ b/tests/basics/gen_yield_from.py.exp
@@ -0,0 +1,14 @@
+here1
+3
+here2
+[1, 2]
+here1
+None
+here2
+[1, 2]
+here1
+123
+here2
+[1, 2]
+444
+[0, 1, 2]
diff --git a/tests/basics/gen_yield_from_close.py.exp b/tests/basics/gen_yield_from_close.py.exp
new file mode 100644
index 000000000..a44d1353d
--- /dev/null
+++ b/tests/basics/gen_yield_from_close.py.exp
@@ -0,0 +1,20 @@
+-1
+1
+StopIteration
+-1
+1
+2
+leaf caught GeneratorExit and swallowed it
+delegating caught GeneratorExit
+StopIteration
+-1
+1
+2
+leaf caught GeneratorExit and raised StopIteration instead
+delegating caught GeneratorExit
+StopIteration
+123
+RuntimeError
+0
+1
+close
diff --git a/tests/basics/gen_yield_from_throw.py b/tests/basics/gen_yield_from_throw.py
index 829bf0f3b..d6754d5cd 100644
--- a/tests/basics/gen_yield_from_throw.py
+++ b/tests/basics/gen_yield_from_throw.py
@@ -21,7 +21,7 @@ except TypeError:
 def gen3():
     yield 123
     yield 456
-        
+
 g3 = gen3()
 print(next(g3))
 try:
diff --git a/tests/basics/gen_yield_from_throw.py.exp b/tests/basics/gen_yield_from_throw.py.exp
new file mode 100644
index 000000000..6ce97ad86
--- /dev/null
+++ b/tests/basics/gen_yield_from_throw.py.exp
@@ -0,0 +1,6 @@
+1
+got ValueError from upstream!
+str1
+got TypeError from downstream!
+123
+got StopIteration from downstream!
diff --git a/tests/basics/gen_yield_from_throw2.py b/tests/basics/gen_yield_from_throw2.py
index 0abfdd8cc..5c0fc7dbc 100644
--- a/tests/basics/gen_yield_from_throw2.py
+++ b/tests/basics/gen_yield_from_throw2.py
@@ -6,7 +6,7 @@ def gen():
     except GeneratorExit:
         print('GeneratorExit')
     yield 456
-        
+
 # thrown a class
 g = gen()
 print(next(g))
diff --git a/tests/basics/generator_close.py.exp b/tests/basics/generator_close.py.exp
new file mode 100644
index 000000000..fcd583935
--- /dev/null
+++ b/tests/basics/generator_close.py.exp
@@ -0,0 +1,10 @@
+None
+StopIteration
+1
+None
+StopIteration
+[1, 2]
+None
+StopIteration
+None
+ValueError
diff --git a/tests/basics/generator_return.py b/tests/basics/generator_return.py
index a3ac88575..5814ce837 100644
--- a/tests/basics/generator_return.py
+++ b/tests/basics/generator_return.py
@@ -7,4 +7,4 @@ print(next(g))
 try:
     print(next(g))
 except StopIteration as e:
-    print(repr(e))
+    print(type(e), e.args)
diff --git a/tests/basics/int_big_and2.py b/tests/basics/int_big_and2.py
index f8c81fe0c..045a90ef7 100644
--- a/tests/basics/int_big_and2.py
+++ b/tests/basics/int_big_and2.py
@@ -1,4 +1,4 @@
-# test + + 
+# test + +
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      & 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@ print( 283894311
 print( 40019818573920230246248826511203818792007462193311949166285967147
      & 9487909752)
 
-# test - - 
+# test - -
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      & -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_and3.py b/tests/basics/int_big_and3.py
index 788ecd823..7a3b415af 100644
--- a/tests/basics/int_big_and3.py
+++ b/tests/basics/int_big_and3.py
@@ -1,4 +1,4 @@
-# test - + 
+# test - +
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      & 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@ print( -283894311
 print( -40019818573920230246248826511203818792007462193311949166285967147
      & 9487909752)
 
-# test + - 
+# test + -
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      & -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_error.py b/tests/basics/int_big_error.py
index e036525d1..79809aef1 100644
--- a/tests/basics/int_big_error.py
+++ b/tests/basics/int_big_error.py
@@ -17,9 +17,9 @@ try:
 except TypeError:
     print("TypeError")
 
-# overflow because rhs of >> is being converted to machine int
+# overflow because arg of bytearray is being converted to machine int
 try:
-    1 >> i
+    bytearray(i)
 except OverflowError:
     print('OverflowError')
 
diff --git a/tests/basics/int_big_or.py b/tests/basics/int_big_or.py
index 17d993526..ccded3778 100644
--- a/tests/basics/int_big_or.py
+++ b/tests/basics/int_big_or.py
@@ -3,7 +3,7 @@ print(0 | (1 << 80))
 a = 0xfffffffffffffffffffffffffffff
 print(a | (1 << 200))
 
-# test + + 
+# test + +
 
 print(0 | (1 << 80))
 print((1 << 80) | (1 << 80))
@@ -15,7 +15,7 @@ print(a | (1 << 200))
 print(a | a == 0)
 print(bool(a | a))
 
-# test - + 
+# test - +
 
 print((-1 << 80) | (1 << 80))
 print((-1 << 80) | 0)
@@ -25,7 +25,7 @@ print((-a) | (1 << 200))
 print((-a) | a == 0)
 print(bool((-a) | a))
 
-# test + - 
+# test + -
 
 print(0 | (-1 << 80))
 print((1 << 80) | (-1 << 80))
@@ -35,7 +35,7 @@ print(a | (-1 << 200))
 print(a | (-a) == 0)
 print(bool(a | (-a)))
 
-# test - - 
+# test - -
 
 print((-1 << 80) | (-1 << 80))
 
diff --git a/tests/basics/int_big_or2.py b/tests/basics/int_big_or2.py
index 255495150..92d76c770 100644
--- a/tests/basics/int_big_or2.py
+++ b/tests/basics/int_big_or2.py
@@ -1,4 +1,4 @@
-# test + + 
+# test + +
 print( 97989513389222316022151446562729620153292831887555425160965597396
      | 23716683549865351578586448630079789776107310103486834795830390982)
 
@@ -23,7 +23,7 @@ print( 283894311
 print( 40019818573920230246248826511203818792007462193311949166285967147
      | 9487909752)
 
-# test - - 
+# test - -
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      | -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_or3.py b/tests/basics/int_big_or3.py
index 07edaea2d..212b3da8a 100644
--- a/tests/basics/int_big_or3.py
+++ b/tests/basics/int_big_or3.py
@@ -1,4 +1,4 @@
-# test - + 
+# test - +
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      | 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@ print( -283894311
 print( -40019818573920230246248826511203818792007462193311949166285967147
      | 9487909752)
 
-# test + - 
+# test + -
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      | -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_xor.py b/tests/basics/int_big_xor.py
index cd1d9ae97..28b191d3d 100644
--- a/tests/basics/int_big_xor.py
+++ b/tests/basics/int_big_xor.py
@@ -1,4 +1,4 @@
-# test + + 
+# test + +
 
 print(0 ^ (1 << 80))
 print((1 << 80) ^ (1 << 80))
@@ -10,7 +10,7 @@ print(a ^ (1 << 200))
 print(a ^ a == 0)
 print(bool(a ^ a))
 
-# test - + 
+# test - +
 
 print((-1 << 80) ^ (1 << 80))
 print((-1 << 80) ^ 0)
@@ -22,7 +22,7 @@ print(bool((-a) ^ a))
 i = -1
 print(i ^ 0xffffffffffffffff) # carry overflows to higher digit
 
-# test + - 
+# test + -
 
 print(0 ^ (-1 << 80))
 print((1 << 80) ^ (-1 << 80))
@@ -32,7 +32,7 @@ print(a ^ (-1 << 200))
 print(a ^ (-a) == 0)
 print(bool(a ^ (-a)))
 
-# test - - 
+# test - -
 
 print((-1 << 80) ^ (-1 << 80))
 
diff --git a/tests/basics/int_big_xor2.py b/tests/basics/int_big_xor2.py
index b5b3db60c..21ef842f8 100644
--- a/tests/basics/int_big_xor2.py
+++ b/tests/basics/int_big_xor2.py
@@ -1,4 +1,4 @@
-# test + + 
+# test + +
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      ^ 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@ print( 283894311
 print( 40019818573920230246248826511203818792007462193311949166285967147
      ^ 9487909752)
 
-# test - - 
+# test - -
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      ^ -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/int_big_xor3.py b/tests/basics/int_big_xor3.py
index 00881e374..ff5e9aeff 100644
--- a/tests/basics/int_big_xor3.py
+++ b/tests/basics/int_big_xor3.py
@@ -1,4 +1,4 @@
-# test - + 
+# test - +
 
 print( -97989513389222316022151446562729620153292831887555425160965597396
      ^ 23716683549865351578586448630079789776107310103486834795830390982)
@@ -24,7 +24,7 @@ print( -283894311
 print( -40019818573920230246248826511203818792007462193311949166285967147
      ^ 9487909752)
 
-# test + - 
+# test + -
 
 print( 97989513389222316022151446562729620153292831887555425160965597396
      ^ -23716683549865351578586448630079789776107310103486834795830390982)
diff --git a/tests/basics/parser.py.exp b/tests/basics/parser.py.exp
new file mode 100644
index 000000000..4d9886a09
--- /dev/null
+++ b/tests/basics/parser.py.exp
@@ -0,0 +1,3 @@
+SyntaxError
+SyntaxError
+SyntaxError
diff --git a/tests/basics/python34.py b/tests/basics/python34.py
index 36531f11c..4030db143 100644
--- a/tests/basics/python34.py
+++ b/tests/basics/python34.py
@@ -1,4 +1,4 @@
-# tests that differ when running under Python 3.4 vs 3.5/3.6
+# tests that differ when running under Python 3.4 vs 3.5/3.6/3.7
 
 try:
     exec
@@ -36,3 +36,7 @@ test_syntax("del ()") # can't delete empty tuple (in 3.6 we can)
 import sys
 print(sys.version[:3])
 print(sys.version_info[0], sys.version_info[1])
+
+# from basics/exception1.py
+# in 3.7 no comma is printed if there is only 1 arg (in 3.4-3.6 one is printed)
+print(repr(IndexError("foo")))
diff --git a/tests/basics/python34.py.exp b/tests/basics/python34.py.exp
index 590fc364f..848017130 100644
--- a/tests/basics/python34.py.exp
+++ b/tests/basics/python34.py.exp
@@ -11,3 +11,4 @@ SyntaxError
 SyntaxError
 3.4
 3 4
+IndexError('foo',)
diff --git a/tests/basics/set_iter.py b/tests/basics/set_iter.py
index 296017730..e7da28e1b 100644
--- a/tests/basics/set_iter.py
+++ b/tests/basics/set_iter.py
@@ -2,4 +2,3 @@ s = {1, 2, 3, 4}
 l = list(s)
 l.sort()
 print(l)
-
diff --git a/tests/basics/set_pop.py b/tests/basics/set_pop.py
index 5e1196c9f..e951ca593 100644
--- a/tests/basics/set_pop.py
+++ b/tests/basics/set_pop.py
@@ -15,4 +15,4 @@ while s:
     print(s.pop()) # last pop() should trigger the optimisation
 for i in range(N):
     s.add(i) # check that we can add the numbers back to the set
-print(list(s))
+print(sorted(s))
diff --git a/tests/basics/string_cr_conversion.py b/tests/basics/string_cr_conversion.py
index 0c3ba16b8..b8ec7e825 100644
--- a/tests/basics/string_cr_conversion.py
+++ b/tests/basics/string_cr_conversion.py
@@ -1 +1 @@
-# this file has CR line endings to test lexer's conversion of them to LF
# in triple quoted strings
print(repr("""abc
def"""))
\ No newline at end of file
+# this file has CR line endings to test lexer's conversion of them to LF
# in triple quoted strings
print(repr("""abc
def"""))
diff --git a/tests/basics/string_pep498_fstring.py b/tests/basics/string_pep498_fstring.py
new file mode 100644
index 000000000..c645a730c
--- /dev/null
+++ b/tests/basics/string_pep498_fstring.py
@@ -0,0 +1,113 @@
+# Tests against https://www.python.org/dev/peps/pep-0498/
+
+assert f'no interpolation' == 'no interpolation'
+assert f"no interpolation" == 'no interpolation'
+
+# Quoth the PEP:
+# Backslashes may not appear anywhere within expressions. Comments, using the
+# '#' character, are not allowed inside an expression
+#
+# CPython (3.7.4 on Linux) raises a SyntaxError here:
+# >>> f'{#}'
+#   File "<stdin>", line 1
+# SyntaxError: f-string expression part cannot include '#'
+# >>> f'{\}'
+#   File "<stdin>", line 1
+# SyntaxError: f-string expression part cannot include a backslash
+# >>> f'{\\}'
+#   File "<stdin>", line 1
+# SyntaxError: f-string expression part cannot include a backslash
+# >>> f'{\#}'
+#   File "<stdin>", line 1
+# SyntaxError: f-string expression part cannot include a backslash
+
+# Backslashes and comments allowed outside expression
+assert f"\\" == "\\"
+assert f'#' == '#'
+
+## But not inside
+try:
+    eval("f'{\}'")
+except SyntaxError:
+    pass
+else:
+    raise AssertionError('f-string with backslash in expression did not raise SyntaxError')
+
+try:
+    eval("f'{#}'")
+except SyntaxError:
+    pass
+else:
+    raise AssertionError('f-string with \'#\' in expression did not raise SyntaxError')
+
+# Quoth the PEP:
+# While scanning the string for expressions, any doubled braces '{{' or '}}'
+# inside literal portions of an f-string are replaced by the corresponding
+# single brace.  Doubled literal opening braces do not signify the start of an
+# expression. A single closing curly brace '}' in the literal portion of a
+# string is an error: literal closing curly braces must be doubled '}}' in
+# order to represent a single closing brace.
+#
+# CPython (3.7.4 on Linux) raises a SyntaxError for the last case:
+# >>> f'{{}'
+#   File "<stdin>", line 1
+# SyntaxError: f-string: single '}' is not allowed
+
+assert f'{{}}' == '{}'
+
+try:
+    eval("f'{{}'")
+except ValueError:
+    pass
+else:
+    raise RuntimeError('Expected ValueError for invalid f-string literal bracing')
+
+x = 1
+assert f'{x}' == '1'
+
+# Quoth the PEP:
+# The expressions that are extracted from the string are evaluated in the
+# context where the f-string appeared. This means the expression has full
+# access to local and global variables. Any valid Python expression can be
+# used, including function and method calls.  Because the f-strings are
+# evaluated where the string appears in the source code, there is no additional
+# expressiveness available with f-strings. There are also no additional
+# security concerns: you could have also just written the same expression, not
+# inside of an f-string:
+
+def foo():
+    return 20
+
+assert f'result={foo()}' == 'result=20'
+assert f'result={foo()}' == 'result={}'.format(foo())
+assert f'result={foo()}' == 'result={result}'.format(result=foo())
+
+
+# Quoth the PEP:
+# Adjacent f-strings and regular strings are concatenated. Regular strings are
+# concatenated at compile time, and f-strings are concatenated at run time. For
+# example, the expression:
+#
+# >>> x = 10
+# >>> y = 'hi'
+# >>> 'a' 'b' f'{x}' '{c}' f'str<{y:^4}>' 'd' 'e'
+#
+# yields the value: 'ab10{c}str< hi >de'
+#
+# Because strings are concatenated at lexer time rather than parser time in
+# MicroPython for mostly RAM efficiency reasons (see
+# https://github.com/micropython/micropython/commit/534b7c368dc2af7720f3aaed0c936ef46d773957),
+# and because f-strings here are implemented as a syntax translation
+# (f'{something}' => '{}'.format(something)), this particular functionality is unimplemented,
+# and in the above example, the '{c}' portion will trigger a KeyError on String.format()
+
+x = 10
+y = 'hi'
+assert (f'h' f'i') == 'hi'
+#assert (f'h' 'i') == 'hi'
+#assert ('h' f'i') == 'hi'
+assert f'{x:^4}' == ' 10 '
+#assert ('a' 'b' f'{x}' f'str<{y:^4}>' 'd' 'e') == 'ab10str< hi >de'
+
+# Other tests
+assert f'{{{4*10}}}' == '{40}'
diff --git a/tests/basics/string_pep498_fstring.py.exp b/tests/basics/string_pep498_fstring.py.exp
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/basics/string_pep498_fstring.py.exp
diff --git a/tests/basics/subclass_native3.py b/tests/basics/subclass_native3.py
index bd99ab0d6..6745b77bb 100644
--- a/tests/basics/subclass_native3.py
+++ b/tests/basics/subclass_native3.py
@@ -7,12 +7,12 @@ print(repr(e))
 print(e.args)
 
 try:
-    raise MyExc("Some error")
+    raise MyExc("Some error", 1)
 except MyExc as e:
     print("Caught exception:", repr(e))
 
 try:
-    raise MyExc("Some error2")
+    raise MyExc("Some error2", 2)
 except Exception as e:
     print("Caught exception:", repr(e))
 
diff --git a/tests/basics/subscr_tuple.py b/tests/basics/subscr_tuple.py
index 85d25366d..0210e24df 100644
--- a/tests/basics/subscr_tuple.py
+++ b/tests/basics/subscr_tuple.py
@@ -4,4 +4,3 @@ class Foo(tuple):
 
 foo = Foo((1,2))
 foo[0]
-
diff --git a/tests/basics/try_as_var.py b/tests/basics/try_as_var.py
index 0a92f1cae..4f02f9c10 100644
--- a/tests/basics/try_as_var.py
+++ b/tests/basics/try_as_var.py
@@ -1,7 +1,7 @@
 try:
     raise ValueError(534)
 except ValueError as e:
-    print(repr(e))
+    print(type(e), e.args)
 
 # Var bound in except block is automatically deleted
 try:
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 12a1bfbe9..c06ce4e31 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -1,6 +1,6 @@
 ----------------
 [   4] rule(1) (n=9)
-         tok(4)
+         tok(10)
 [   4]   rule(22) (n=4)
            id(i)
 [   4]     rule(44) (n=1)
@@ -9,7 +9,7 @@
            NULL
 [   6]   rule(5) (n=2)
            id(a)
-           tok(14)
+           tok(20)
 [   7]   rule(5) (n=2)
            id(b)
            str(str)
diff --git a/tests/extmod/uctypes_array_assign_le.py b/tests/extmod/uctypes_array_assign_le.py
index 6afa7e0a2..37c52388d 100644
--- a/tests/extmod/uctypes_array_assign_le.py
+++ b/tests/extmod/uctypes_array_assign_le.py
@@ -55,4 +55,3 @@ assert hex(S.arr6[0]) == "0xaabbccdd"
 
 print(S.arr6[0] == S.arr8[0].l)
 assert S.arr6[0] == S.arr8[0].l
-
diff --git a/tests/extmod/uctypes_byteat.py b/tests/extmod/uctypes_byteat.py
index ab2535db8..784209f80 100644
--- a/tests/extmod/uctypes_byteat.py
+++ b/tests/extmod/uctypes_byteat.py
@@ -6,5 +6,5 @@ except ImportError:
 
 data = bytearray(b'01234567')
 
-print(uctypes.bytes_at(uctypes.addressof(data), 4)) 
-print(uctypes.bytearray_at(uctypes.addressof(data), 4)) 
+print(uctypes.bytes_at(uctypes.addressof(data), 4))
+print(uctypes.bytearray_at(uctypes.addressof(data), 4))
diff --git a/tests/extmod/uctypes_error.py b/tests/extmod/uctypes_error.py
index 95ba0fad4..2500e2927 100644
--- a/tests/extmod/uctypes_error.py
+++ b/tests/extmod/uctypes_error.py
@@ -9,29 +9,29 @@ except ImportError:
 data = bytearray(b"01234567")
 
 # del subscr not supported
-S = uctypes.struct(uctypes.addressof(data), {}) 
+S = uctypes.struct(uctypes.addressof(data), {})
 try:
     del S[0]
 except TypeError:
     print('TypeError')
 
 # list is an invalid descriptor
-S = uctypes.struct(uctypes.addressof(data), []) 
+S = uctypes.struct(uctypes.addressof(data), [])
 try:
-    S.x 
+    S.x
 except TypeError:
     print('TypeError')
 
 # can't access attribute with invalid descriptor
 S = uctypes.struct(uctypes.addressof(data), {'x':[]})
 try:
-    S.x 
+    S.x
 except TypeError:
     print('TypeError')
 
 # can't assign to aggregate
 S = uctypes.struct(uctypes.addressof(data), {'x':(uctypes.ARRAY | 0, uctypes.INT8 | 2)})
 try:
-    S.x = 1 
+    S.x = 1
 except TypeError:
     print('TypeError')
diff --git a/tests/extmod/ujson_dump_iobase.py b/tests/extmod/ujson_dump_iobase.py
index d30d1b561..6280fb11b 100644
--- a/tests/extmod/ujson_dump_iobase.py
+++ b/tests/extmod/ujson_dump_iobase.py
@@ -28,5 +28,5 @@ class S(io.IOBase):
 
 # dump to the user stream
 s = S()
-json.dump([123, {}], s) 
+json.dump([123, {}], s)
 print(s.buf)
diff --git a/tests/extmod/ure_sub.py b/tests/extmod/ure_sub.py
index 4aeb8650a..f5a19af8d 100644
--- a/tests/extmod/ure_sub.py
+++ b/tests/extmod/ure_sub.py
@@ -27,11 +27,11 @@ print(re.sub('a', A(), 'aBCBABCDabcda.'))
 
 print(
     re.sub(
-        r'def\s+([a-zA-Z_][a-zA-Z_0-9]*)\s*\(\s*\):', 
-        'static PyObject*\npy_\\1(void){\n  return;\n}\n', 
+        r'def\s+([a-zA-Z_][a-zA-Z_0-9]*)\s*\(\s*\):',
+        'static PyObject*\npy_\\1(void){\n  return;\n}\n',
         '\n\ndef myfunc():\n\ndef myfunc1():\n\ndef myfunc2():'
     )
-) 
+)
 
 print(
     re.compile(
diff --git a/tests/feature_check/complex.py b/tests/feature_check/complex.py
index a22eb52ce..7576dcb95 100644
--- a/tests/feature_check/complex.py
+++ b/tests/feature_check/complex.py
@@ -3,4 +3,3 @@ try:
     print("complex")
 except NameError:
     print("no")
-
diff --git a/tests/float/builtin_float_minmax.py b/tests/float/builtin_float_minmax.py
index 266ed133d..8a53746e5 100644
--- a/tests/float/builtin_float_minmax.py
+++ b/tests/float/builtin_float_minmax.py
@@ -29,4 +29,3 @@ print(min([1, 2.9, 4, 6.5, -1, 2]))
 print(max([1, 2.9, 4, 6.5, -1, 2]))
 print(min([1, 2.9, 4, -6.5, -1, 2]))
 print(max([1, 2.9, 4, -6.5, -1, 2]))
-
diff --git a/tests/float/float_struct.py b/tests/float/float_struct.py
index c4c186b89..dd7a418ad 100644
--- a/tests/float/float_struct.py
+++ b/tests/float/float_struct.py
@@ -15,4 +15,3 @@ for fmt in ('f', 'd', '>f', '>d', '<f', '<d'):
     x = struct.pack(fmt, i)
     v = struct.unpack(fmt, x)[0]
     print('%2s: %.17f - %s' % (fmt, v, (i == v) and 'passed' or 'failed'))
-
diff --git a/tests/float/math_fun_bool.py b/tests/float/math_fun_bool.py
index 30ab14a52..761871b41 100644
--- a/tests/float/math_fun_bool.py
+++ b/tests/float/math_fun_bool.py
@@ -6,7 +6,7 @@ except ImportError:
     print("SKIP")
     raise SystemExit
 
-test_values = [1, 0, -1, 1.0, 0.0, -1.0, float('NaN'), float('Inf'), 
+test_values = [1, 0, -1, 1.0, 0.0, -1.0, float('NaN'), float('Inf'),
                -float('NaN'), -float('Inf')]
 
 functions = [isfinite, isnan, isinf]
diff --git a/tests/import/import_override.py.exp b/tests/import/import_override.py.exp
new file mode 100644
index 000000000..365248da6
--- /dev/null
+++ b/tests/import/import_override.py.exp
@@ -0,0 +1,2 @@
+import import1b None 0
+456
diff --git a/tests/inlineasm/asmfpaddsub.py b/tests/inlineasm/asmfpaddsub.py
index b5fcecb6c..2bdfccf0e 100644
--- a/tests/inlineasm/asmfpaddsub.py
+++ b/tests/inlineasm/asmfpaddsub.py
@@ -12,4 +12,3 @@ def add_sub(r0, r1, r2):
     vmov(r0, s31)
 
 print(add_sub(100, 20, 30))
-
diff --git a/tests/inlineasm/asmfpldrstr.py b/tests/inlineasm/asmfpldrstr.py
index 8fa9af636..4c480671f 100644
--- a/tests/inlineasm/asmfpldrstr.py
+++ b/tests/inlineasm/asmfpldrstr.py
@@ -9,4 +9,3 @@ def arrayadd(r0):
 z = array.array("f", [2, 4, 10])
 arrayadd(z)
 print(z[2])
-
diff --git a/tests/inlineasm/asmfpmuldiv.py b/tests/inlineasm/asmfpmuldiv.py
index edf9511bc..043a28e22 100644
--- a/tests/inlineasm/asmfpmuldiv.py
+++ b/tests/inlineasm/asmfpmuldiv.py
@@ -12,4 +12,3 @@ def muldiv(r0, r1, r2):
     vmov(r0, s31)
 
 print(muldiv(100, 10, 50))
-
diff --git a/tests/inlineasm/asmfpsqrt.py b/tests/inlineasm/asmfpsqrt.py
index f2c2d3a95..7b7d52e23 100644
--- a/tests/inlineasm/asmfpsqrt.py
+++ b/tests/inlineasm/asmfpsqrt.py
@@ -12,4 +12,3 @@ def sqrt_test(r0, r1):
     vmov(r0, s31)
 
 print(sqrt_test(256, 10))
-
diff --git a/tests/inlineasm/asmspecialregs.py b/tests/inlineasm/asmspecialregs.py
index edfe4c2bd..2d3b0e396 100644
--- a/tests/inlineasm/asmspecialregs.py
+++ b/tests/inlineasm/asmspecialregs.py
@@ -8,4 +8,3 @@ def getBASEPRI():
 
 print(getBASEPRI())
 print(getIPSR())
-
diff --git a/tests/jni/README b/tests/jni/README
index 8418bb84f..a0689e924 100644
--- a/tests/jni/README
+++ b/tests/jni/README
@@ -9,4 +9,3 @@ of JVM.
 For example, for OpenJDK 7 on x86_64, following may work:
 
 LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server ./run-tests jni/*.py
-
diff --git a/tests/misc/features.py b/tests/misc/features.py
index 3efb476ab..de75cb46d 100644
--- a/tests/misc/features.py
+++ b/tests/misc/features.py
@@ -25,7 +25,7 @@ print(ten())
 a=[]
 for i in range(13):
 	a.append(i)
-print(a[11])	
+print(a[11])
 print(a[-1])
 str="0123456789"
 print(str[1]+str[3])
@@ -73,13 +73,13 @@ while True:
 	try:
 		def gcheck():
 			global a
-			print(a)	
+			print(a)
 		gcheck()
 		class c25():
 			x=25
 		x=c25()
 		print(x.x)
-		raise 
+		raise
 	except:
 		print(26)
 	print(27+zero)
diff --git a/tests/misc/sys_exc_info.py b/tests/misc/sys_exc_info.py
index 4bb2c61e8..bf9438e46 100644
--- a/tests/misc/sys_exc_info.py
+++ b/tests/misc/sys_exc_info.py
@@ -9,7 +9,7 @@ def f():
     print(sys.exc_info()[0:2])
 
 try:
-    1/0
+    raise ValueError('value', 123)
 except:
     print(sys.exc_info()[0:2])
     f()
diff --git a/tests/pyb/halerror.py b/tests/pyb/halerror.py
deleted file mode 100644
index 1a6bce1a7..000000000
--- a/tests/pyb/halerror.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# test hal errors
-
-import pyb
-
-i2c = pyb.I2C(2, pyb.I2C.MASTER)
-try:
-    i2c.recv(1, 1)
-except OSError as e:
-    print(repr(e))
-
-can = pyb.CAN(1, pyb.CAN.NORMAL)
-try:
-    can.send('1', 1, timeout=50)
-except OSError as e:
-    print(repr(e))
diff --git a/tests/pyb/i2c.py b/tests/pyb/i2c.py
deleted file mode 100644
index 6875e5a5a..000000000
--- a/tests/pyb/i2c.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import pyb
-from pyb import I2C
-
-# test we can correctly create by id or name
-for bus in (-1, 0, 1, 2, 3, "X", "Y", "Z"):
-    try:
-        I2C(bus)
-        print("I2C", bus)
-    except ValueError:
-        print("ValueError", bus)
-
-i2c = I2C(1)
-
-i2c.init(I2C.MASTER, baudrate=400000)
-print(i2c.scan())
-i2c.deinit()
-
-# use accelerometer to test i2c bus
-
-accel_addr = 76
-
-pyb.Accel() # this will init the MMA for us
-i2c.init(I2C.MASTER, baudrate=400000)
-
-print(i2c.scan())
-print(i2c.is_ready(accel_addr))
-
-print(i2c.mem_read(1, accel_addr, 7, timeout=500))
-i2c.mem_write(0, accel_addr, 0, timeout=500)
-
-i2c.send(7, addr=accel_addr)
-i2c.recv(1, addr=accel_addr)
diff --git a/tests/pyb/i2c.py.exp b/tests/pyb/i2c.py.exp
deleted file mode 100644
index 709fb412d..000000000
--- a/tests/pyb/i2c.py.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-ValueError -1
-ValueError 0
-I2C 1
-I2C 2
-ValueError 3
-I2C X
-I2C Y
-ValueError Z
-[]
-[76]
-True
-b'\x01'
diff --git a/tests/pyb/i2c_error.py b/tests/pyb/i2c_error.py
deleted file mode 100644
index 3201d6367..000000000
--- a/tests/pyb/i2c_error.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# test I2C errors, with polling (disabled irqs) and DMA
-
-import pyb
-from pyb import I2C
-
-# init accelerometer
-pyb.Accel()
-
-# get I2C bus
-i2c = I2C(1, I2C.MASTER, dma=True)
-
-# test polling mem_read
-pyb.disable_irq()
-i2c.mem_read(1, 76, 0x0a) # should succeed
-pyb.enable_irq()
-try:
-    pyb.disable_irq()
-    i2c.mem_read(1, 77, 0x0a) # should fail
-except OSError as e:
-    pyb.enable_irq()
-    print(repr(e))
-i2c.mem_read(1, 76, 0x0a) # should succeed
-
-# test polling mem_write
-pyb.disable_irq()
-i2c.mem_write(1, 76, 0x0a) # should succeed
-pyb.enable_irq()
-try:
-    pyb.disable_irq()
-    i2c.mem_write(1, 77, 0x0a) # should fail
-except OSError as e:
-    pyb.enable_irq()
-    print(repr(e))
-i2c.mem_write(1, 76, 0x0a) # should succeed
-
-# test DMA mem_read
-i2c.mem_read(1, 76, 0x0a) # should succeed
-try:
-    i2c.mem_read(1, 77, 0x0a) # should fail
-except OSError as e:
-    print(repr(e))
-i2c.mem_read(1, 76, 0x0a) # should succeed
-
-# test DMA mem_write
-i2c.mem_write(1, 76, 0x0a) # should succeed
-try:
-    i2c.mem_write(1, 77, 0x0a) # should fail
-except OSError as e:
-    print(repr(e))
-i2c.mem_write(1, 76, 0x0a) # should succeed
diff --git a/tests/pyb/spi.py b/tests/pyb/spi.py
deleted file mode 100644
index 88cc975bb..000000000
--- a/tests/pyb/spi.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from pyb import SPI
-
-# test we can correctly create by id or name
-for bus in (-1, 0, 1, 2, 3, "X", "Y", "Z"):
-    try:
-        SPI(bus)
-        print("SPI", bus)
-    except ValueError:
-        print("ValueError", bus)
-
-spi = SPI(1)
-print(spi)
-
-spi = SPI(1, SPI.MASTER)
-spi = SPI(1, SPI.MASTER, baudrate=500000)
-spi = SPI(1, SPI.MASTER, 500000, polarity=1, phase=0, bits=8, firstbit=SPI.MSB, ti=False, crc=None)
-print(spi)
-
-spi.init(SPI.SLAVE, phase=1)
-print(spi)
-try:
-    # need to flush input before we get an error (error is what we want to test)
-    for i in range(10):
-        spi.recv(1, timeout=100)
-except OSError:
-    print("OSError")
-
-spi.init(SPI.MASTER)
-spi.send(1, timeout=100)
-print(spi.recv(1, timeout=100))
-print(spi.send_recv(1, timeout=100))
-
-spi.deinit()
diff --git a/tests/pyb/spi.py.exp b/tests/pyb/spi.py.exp
deleted file mode 100644
index a0d835700..000000000
--- a/tests/pyb/spi.py.exp
+++ /dev/null
@@ -1,14 +0,0 @@
-ValueError -1
-ValueError 0
-SPI 1
-SPI 2
-ValueError 3
-SPI X
-SPI Y
-ValueError Z
-SPI(1)
-SPI(1, SPI.MASTER, baudrate=328125, prescaler=256, polarity=1, phase=0, bits=8)
-SPI(1, SPI.SLAVE, polarity=1, phase=1, bits=8)
-OSError
-b'\xff'
-b'\xff'
diff --git a/tests/run-tests b/tests/run-tests
index 94e1591e8..151d48095 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -87,28 +87,32 @@ def run_micropython(pyb, args, test_file, is_special=False):
                     def get(required=False):
                         rv = b''
                         while True:
-                            ready = select.select([master], [], [], 0.02)
-                            if ready[0] == [master]:
-                                rv += os.read(master, 1024)
+                            ready = select.select([emulator], [], [], 0.02)
+                            if ready[0] == [emulator]:
+                                rv += os.read(emulator, 1024)
                             else:
                                 if not required or rv:
                                     return rv
 
                     def send_get(what):
-                        os.write(master, what)
+                        os.write(emulator, what)
                         return get()
 
                     with open(test_file, 'rb') as f:
                         # instead of: output_mupy = subprocess.check_output(args, stdin=f)
-                        master, slave = pty.openpty()
-                        p = subprocess.Popen(args, stdin=slave, stdout=slave,
+                        # openpty returns two read/write file descriptors.  The first one is
+                        # used by the program which provides the virtual
+                        # terminal service, and the second one is used by the
+                        # subprogram which requires a tty to work.
+                        emulator, subterminal = pty.openpty()
+                        p = subprocess.Popen(args, stdin=subterminal, stdout=subterminal,
                                              stderr=subprocess.STDOUT, bufsize=0)
                         banner = get(True)
                         output_mupy = banner + b''.join(send_get(line) for line in f)
                         send_get(b'\x04') # exit the REPL, so coverage info is saved
                         p.kill()
-                        os.close(master)
-                        os.close(slave)
+                        os.close(emulator)
+                        os.close(subterminal)
                 else:
                     output_mupy = subprocess.check_output(args + [test_file], stderr=subprocess.STDOUT)
             except subprocess.CalledProcessError:
@@ -385,6 +389,7 @@ def run_tests(pyb, tests, args, base_path=".", num_threads=1):
         skip_tests.add('stress/gc_trace.py') # requires yield
         skip_tests.add('stress/recursive_gen.py') # requires yield
         skip_tests.add('extmod/vfs_userfs.py') # because native doesn't properly handle globals across different modules
+        skip_tests.add('../extmod/ulab/tests/argminmax.py') # requires yield
 
     def run_one_test(test_file):
         test_file = test_file.replace('\\', '/')
@@ -579,7 +584,7 @@ the last matching regex is used:
                 # run PC tests
                 test_dirs = (
                     'basics', 'micropython', 'float', 'import', 'io', 'misc',
-                    'stress', 'unicode', 'extmod', 'unix', 'cmdline',
+                    'stress', 'unicode', 'extmod', '../extmod/ulab/tests', 'unix', 'cmdline',
                 )
         else:
             # run tests from these directories
diff --git a/tests/thread/mutate_bytearray.py b/tests/thread/mutate_bytearray.py
index f3276f1b2..f91b2d580 100644
--- a/tests/thread/mutate_bytearray.py
+++ b/tests/thread/mutate_bytearray.py
@@ -42,4 +42,3 @@ count = [0 for _ in range(256)]
 for b in ba:
     count[b] += 1
 print(count)
-
diff --git a/tests/wipy/i2c.py b/tests/wipy/i2c.py
deleted file mode 100644
index 693155419..000000000
--- a/tests/wipy/i2c.py
+++ /dev/null
@@ -1,176 +0,0 @@
-'''
-I2C test for the CC3200 based boards.
-A MPU-9150 sensor must be connected to the I2C bus.
-'''
-
-from machine import I2C
-import os
-import time
-
-mch = os.uname().machine
-if 'LaunchPad' in mch:
-    i2c_pins = ('GP11', 'GP10')
-elif 'WiPy' in mch:
-    i2c_pins = ('GP15', 'GP10')
-else:
-    raise Exception('Board not supported!')
-
-i2c = I2C(0, I2C.MASTER, baudrate=400000)
-# try initing without the peripheral id
-i2c = I2C()
-print(i2c)
-i2c = I2C(mode=I2C.MASTER, baudrate=50000, pins=i2c_pins)
-print(i2c)
-
-i2c = I2C(0, I2C.MASTER, baudrate=100000)
-print(i2c)
-i2c = I2C(0, mode=I2C.MASTER, baudrate=400000)
-print(i2c)
-i2c = I2C(0, mode=I2C.MASTER, baudrate=400000, pins=i2c_pins)
-print(i2c)
-
-addr = i2c.scan()[0]
-print(addr)
-
-reg = bytearray(1)
-reg2 = bytearray(2)
-reg2_r = bytearray(2)
-
-# reset the sensor
-reg[0] |= 0x80
-print(1 == i2c.writeto_mem(addr, 107, reg))
-time.sleep_ms(100)  # wait for the sensor to reset...
-
-print(1 == i2c.readfrom_mem_into(addr, 107, reg)) # read the power management register 1
-print(0x40 == reg[0])
-
-# now just read one byte
-data = i2c.readfrom_mem(addr, 117, 1) # read the "who am I?" register
-print(0x68 == data[0])
-print(len(data) == 1)
-print(1 == i2c.readfrom_mem_into(addr, 117, reg)) # read the "who am I?" register again
-print(0x68 == reg[0])
-
-# now try reading two bytes
-data = i2c.readfrom_mem(addr, 116, 2) # read the "who am I?" register
-print(0x68 == data[1])
-print(data == b'\x00\x68')
-print(len(data) == 2)
-print(2 == i2c.readfrom_mem_into(addr, 116, reg2)) # read the "who am I?" register again
-print(0x68 == reg2[1])
-print(reg2 == b'\x00\x68')
-
-print(1 == i2c.readfrom_mem_into(addr, 107, reg)) # read the power management register 1
-print(0x40 == reg[0])
-# clear the sleep bit
-reg[0] = 0
-print(1 == i2c.writeto_mem(addr, 107, reg))
-# read it back
-i2c.readfrom_mem_into(addr, 107, reg)
-print(0 == reg[0])
-
-# set the sleep bit
-reg[0] = 0x40
-print(1 == i2c.writeto_mem(addr, 107, reg))
-# read it back
-i2c.readfrom_mem_into(addr, 107, reg)
-print(0x40 == reg[0])
-
-# reset the sensor
-reg[0] |= 0x80
-print(1 == i2c.writeto_mem(addr, 107, reg))
-time.sleep_ms(100)  # wait for the sensor to reset...
-
-# now read and write two register at a time
-print(2 == i2c.readfrom_mem_into(addr, 107, reg2))
-print(0x40 == reg2[0])
-print(0x00 == reg2[1])
-# clear the sleep bit
-reg2[0] = 0
-# set some other bits
-reg2[1] |= 0x03
-print(2 == i2c.writeto_mem(addr, 107, reg2))
-# read it back
-i2c.readfrom_mem_into(addr, 107, reg2_r)
-print(reg2 == reg2_r)
-
-# reset the sensor
-reg[0] = 0x80
-print(1 == i2c.writeto_mem(addr, 107, reg))
-time.sleep_ms(100)  # wait for the sensor to reset...
-
-# try some raw read and writes
-reg[0] = 117 # register address
-print(1 == i2c.writeto(addr, reg, stop=False)) # just write the register address
-# now read
-print(1 == i2c.readfrom_into(addr, reg))
-print(reg[0] == 0x68)
-reg[0] = 117 # register address
-print(1 == i2c.writeto(addr, reg, stop=False)) # just write the register address
-# now read
-print(0x68 == i2c.readfrom(addr, 1)[0])
-
-i2c.readfrom_mem_into(addr, 107, reg2)
-print(0x40 == reg2[0])
-print(0x00 == reg2[1])
-
-reg2[0] = 107 # register address
-reg2[1] = 0
-print(2 == i2c.writeto(addr, reg2, stop=True)) # write the register address and the data
-i2c.readfrom_mem_into(addr, 107, reg) # check it back
-print(reg[0] == 0)
-
-# check for memory leaks...
-for i in range (0, 1000):
-    i2c = I2C(0, I2C.MASTER, baudrate=100000)
-
-# test deinit
-i2c = I2C(0, I2C.MASTER, baudrate=100000)
-i2c.deinit()
-print(i2c)
-
-# next ones should raise
-try:
-    i2c.scan()
-except Exception:
-    print("Exception")
-
-try:
-    i2c.readfrom(addr, 1)
-except Exception:
-    print("Exception")
-
-try:
-    i2c.readfrom_into(addr, reg)
-except Exception:
-    print("Exception")
-
-try:
-    i2c.readfrom_mem_into(addr, 107, reg)
-except Exception:
-    print("Exception")
-
-try:
-    i2c.writeto(addr, reg, stop=False)
-except Exception:
-    print("Exception")
-
-try:
-    i2c.writeto_mem(addr, 107, reg)
-except Exception:
-    print("Exception")
-
-try:
-    i2c.readfrom_mem(addr, 116, 2)
-except Exception:
-    print("Exception")
-
-try:
-    I2C(1, I2C.MASTER, baudrate=100000)
-except Exception:
-    print("Exception")
-
-# reinitialization must work
-i2c.init(baudrate=400000)
-print(i2c)
-
diff --git a/tests/wipy/i2c.py.exp b/tests/wipy/i2c.py.exp
deleted file mode 100644
index 083da9be7..000000000
--- a/tests/wipy/i2c.py.exp
+++ /dev/null
@@ -1,51 +0,0 @@
-I2C(0, I2C.MASTER, baudrate=100000)
-I2C(0, I2C.MASTER, baudrate=50000)
-I2C(0, I2C.MASTER, baudrate=100000)
-I2C(0, I2C.MASTER, baudrate=400000)
-I2C(0, I2C.MASTER, baudrate=400000)
-104
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-I2C(0)
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-I2C(0, I2C.MASTER, baudrate=400000)
diff --git a/tests/wipy/pin.py b/tests/wipy/pin.py
index 22c7c6176..666ecb66b 100644
--- a/tests/wipy/pin.py
+++ b/tests/wipy/pin.py
@@ -1,7 +1,7 @@
-""" 
-This test need a set of pins which can be set as inputs and have no external 
+"""
+This test need a set of pins which can be set as inputs and have no external
 pull up or pull down connected.
-GP12 and GP17 must be connected together 
+GP12 and GP17 must be connected together
 """
 from machine import Pin
 import os
@@ -179,4 +179,3 @@ try:
     pin.id('ABC') # id cannot be set
 except Exception:
     print('Exception')
-
diff --git a/tests/wipy/sd.py b/tests/wipy/sd.py
index 92746e01e..c946e0c9f 100644
--- a/tests/wipy/sd.py
+++ b/tests/wipy/sd.py
@@ -43,4 +43,3 @@ try:
     sd = SD(pins=('GP10', 'GP11'))
 except Exception:
     print("Exception")
-
diff --git a/tests/wipy/spi.py b/tests/wipy/spi.py
deleted file mode 100644
index 6bd7aabce..000000000
--- a/tests/wipy/spi.py
+++ /dev/null
@@ -1,147 +0,0 @@
-'''
-SPI test for the CC3200 based boards.
-'''
-
-from machine import SPI
-import os
-
-mch = os.uname().machine
-if 'LaunchPad' in mch:
-    spi_pins = ('GP14', 'GP16', 'GP30')
-elif 'WiPy' in mch:
-    spi_pins = ('GP14', 'GP16', 'GP30')
-else:
-    raise Exception('Board not supported!')
-
-spi = SPI(0, SPI.MASTER, baudrate=2000000, polarity=0, phase=0, firstbit=SPI.MSB, pins=spi_pins)
-print(spi)
-spi = SPI(baudrate=5000000)
-print(spi)
-spi = SPI(0, SPI.MASTER, baudrate=200000, bits=16, polarity=0, phase=0)
-print(spi)
-spi = SPI(0, SPI.MASTER, baudrate=10000000, polarity=0, phase=1)
-print(spi)
-spi = SPI(0, SPI.MASTER, baudrate=5000000, bits=32, polarity=1, phase=0)
-print(spi)
-spi = SPI(0, SPI.MASTER, baudrate=10000000, polarity=1, phase=1)
-print(spi)
-spi.init(baudrate=20000000, polarity=0, phase=0)
-print(spi)
-spi=SPI()
-print(spi)
-SPI(mode=SPI.MASTER)
-SPI(mode=SPI.MASTER, pins=spi_pins)
-SPI(id=0, mode=SPI.MASTER, polarity=0, phase=0, pins=('GP14', 'GP16', 'GP15'))
-SPI(0, SPI.MASTER, polarity=0, phase=0, pins=('GP31', 'GP16', 'GP15'))
-
-spi = SPI(0, SPI.MASTER, baudrate=10000000, polarity=0, phase=0, pins=spi_pins)
-print(spi.write('123456') == 6)
-buffer_r = bytearray(10)
-print(spi.readinto(buffer_r) == 10)
-print(spi.readinto(buffer_r, write=0x55) == 10)
-read = spi.read(10)
-print(len(read) == 10)
-read = spi.read(10, write=0xFF)
-print(len(read) == 10)
-buffer_w = bytearray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0])
-print(spi.write_readinto(buffer_w, buffer_r) == 10)
-print(buffer_w == buffer_r)
-
-# test all polaritiy and phase combinations
-spi.init(polarity=1, phase=0, pins=None)
-buffer_r = bytearray(10)
-spi.write_readinto(buffer_w, buffer_r)
-print(buffer_w == buffer_r)
-
-spi.init(polarity=1, phase=1, pins=None)
-buffer_r = bytearray(10)
-spi.write_readinto(buffer_w, buffer_r)
-print(buffer_w == buffer_r)
-
-spi.init(polarity=0, phase=1, pins=None)
-buffer_r = bytearray(10)
-spi.write_readinto(buffer_w, buffer_r)
-print(buffer_w == buffer_r)
-
-# test 16 and 32 bit transfers
-buffer_w = bytearray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2])
-buffer_r = bytearray(12)
-spi.init(SPI.MASTER, baudrate=10000000, bits=16, polarity=0, phase=0, pins=None)
-print(spi.write_readinto(buffer_w, buffer_r) == 12)
-print(buffer_w == buffer_r)
-
-buffer_r = bytearray(12)
-spi.init(SPI.MASTER, baudrate=10000000, bits=32, polarity=0, phase=0, pins=None)
-print(spi.write_readinto(buffer_w, buffer_r) == 12)
-print(buffer_w == buffer_r)
-
-# check for memory leaks...
-for i in range (0, 1000):
-    spi = SPI(0, SPI.MASTER, baudrate=1000000)
-
-# test deinit
-spi = SPI(0, SPI.MASTER, baudrate=1000000)
-spi.deinit()
-print(spi)
-
-spi = SPI(0, SPI.MASTER, baudrate=1000000)
-# next ones must fail
-try:
-    spi = SPI(0, 10, baudrate=10000000, polarity=0, phase=0)
-except:
-    print("Exception")
-
-try:
-    spi = SPI(0, mode=SPI.MASTER, baudrate=10000000, polarity=1, phase=2)
-except:
-    print("Exception")
-
-try:
-    spi = SPI(1, mode=SPI.MASTER, baudrate=10000000, polarity=1, phase=1)
-except:
-    print("Exception")
-
-try:
-    spi = SPI(0, mode=SPI.MASTER, baudrate=2000000, polarity=2, phase=0)
-except:
-    print("Exception")
-
-try:
-    spi = SPI(0, mode=SPI.MASTER, baudrate=2000000, polarity=2, phase=0, firstbit=2)
-except:
-    print("Exception")
-
-try:
-    spi = SPI(0, mode=SPI.MASTER, baudrate=2000000, polarity=2, phase=0, pins=('GP1', 'GP2'))
-except:
-    print("Exception")
-
-try:
-    spi = SPI(0, mode=SPI.MASTER, baudrate=2000000, polarity=0, phase=0, bits=9)
-except:
-    print("Exception")
-
-spi.deinit()
-try:
-    spi.read(15)
-except Exception:
-    print("Exception")
-
-try:
-    spi.spi.readinto(buffer_r)
-except Exception:
-    print("Exception")
-
-try:
-    spi.spi.write('abc')
-except Exception:
-    print("Exception")
-
-try:
-    spi.write_readinto(buffer_w, buffer_r)
-except Exception:
-    print("Exception")
-
-# reinitialization must work
-spi.init(baudrate=500000)
-print(spi)
diff --git a/tests/wipy/spi.py.exp b/tests/wipy/spi.py.exp
deleted file mode 100644
index cc4ff4022..000000000
--- a/tests/wipy/spi.py.exp
+++ /dev/null
@@ -1,35 +0,0 @@
-SPI(0, SPI.MASTER, baudrate=2000000, bits=8, polarity=0, phase=0, firstbit=SPI.MSB)
-SPI(0, SPI.MASTER, baudrate=5000000, bits=8, polarity=0, phase=0, firstbit=SPI.MSB)
-SPI(0, SPI.MASTER, baudrate=200000, bits=16, polarity=0, phase=0, firstbit=SPI.MSB)
-SPI(0, SPI.MASTER, baudrate=10000000, bits=8, polarity=0, phase=1, firstbit=SPI.MSB)
-SPI(0, SPI.MASTER, baudrate=5000000, bits=32, polarity=1, phase=0, firstbit=SPI.MSB)
-SPI(0, SPI.MASTER, baudrate=10000000, bits=8, polarity=1, phase=1, firstbit=SPI.MSB)
-SPI(0, SPI.MASTER, baudrate=20000000, bits=8, polarity=0, phase=0, firstbit=SPI.MSB)
-SPI(0, SPI.MASTER, baudrate=1000000, bits=8, polarity=0, phase=0, firstbit=SPI.MSB)
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-True
-SPI(0)
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-Exception
-SPI(0, SPI.MASTER, baudrate=500000, bits=8, polarity=0, phase=0, firstbit=SPI.MSB)
diff --git a/tests/wipy/uart.py b/tests/wipy/uart.py
index 8e794015d..d8b405f77 100644
--- a/tests/wipy/uart.py
+++ b/tests/wipy/uart.py
@@ -1,5 +1,5 @@
 '''
-UART test for the CC3200 based boards. 
+UART test for the CC3200 based boards.
 UART0 and UART1 must be connected together for this test to pass.
 '''
 
@@ -58,7 +58,7 @@ print(uart0.read() == None)
 
 uart0.write(b'123')
 buf = bytearray(3)
-print(uart1.readinto(buf, 1) == 1) 
+print(uart1.readinto(buf, 1) == 1)
 print(buf)
 print(uart1.readinto(buf) == 2)
 print(buf)
@@ -145,7 +145,7 @@ except Exception:
 try:
     UART(2, 9600)
 except Exception:
-    print('Exception')    
+    print('Exception')
 
 for uart_id in uart_id_range:
     uart = UART(uart_id, 1000000)
diff --git a/tests/wipy/wlan/wlan.py b/tests/wipy/wlan/wlan.py
index 49e2e4af6..96121325c 100644
--- a/tests/wipy/wlan/wlan.py
+++ b/tests/wipy/wlan/wlan.py
@@ -179,4 +179,3 @@ try:
     wifi.ifconfig(config=())
 except:
     print('Exception')
-