diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-14 23:58:05 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-14 23:58:05 +0000 |
commit | ff8007c7d6497b108e8abe80ab3311945a03fe52 (patch) | |
tree | e2f6974d6476cc46b7414ba0626cb519142c3e3d /tests | |
parent | 9daa78943e58602f74c89a2b5b1ed225f4ccf6cc (diff) | |
parent | c6920d31e2b03205fe2851f74a6a4b48d0165608 (diff) | |
download | micropython-ff8007c7d6497b108e8abe80ab3311945a03fe52.tar.gz micropython-ff8007c7d6497b108e8abe80ab3311945a03fe52.zip |
Merge remote-tracking branch 'upstream/master' into builtins
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/basics/run-tests | 3 | ||||
-rw-r--r-- | tests/basics/tests/containment.py | 23 | ||||
-rw-r--r-- | tests/basics/tests/exception1.py | 3 |
3 files changed, 29 insertions, 0 deletions
diff --git a/tests/basics/run-tests b/tests/basics/run-tests index 0c3995da15..bc2969ae3d 100755 --- a/tests/basics/run-tests +++ b/tests/basics/run-tests @@ -42,4 +42,7 @@ echo "$numpassed tests passed" if [[ $numfailed != 0 ]] then echo "$numfailed tests failed -$namefailed" + exit 1 +else + exit 0 fi diff --git a/tests/basics/tests/containment.py b/tests/basics/tests/containment.py new file mode 100644 index 0000000000..84d40b4e8f --- /dev/null +++ b/tests/basics/tests/containment.py @@ -0,0 +1,23 @@ +for i in 1, 2: + for o in {1:2}, {1}, {1:2}.keys(): + print("{} in {}: {}".format(i, o, i in o)) + print("{} not in {}: {}".format(i, o, i not in o)) + +haystack = "supercalifragilistc" +for needle in (haystack[i:] for i in range(len(haystack))): + print(needle, "in", haystack, "::", needle in haystack) + print(needle, "not in", haystack, "::", needle not in haystack) + print(haystack, "in", needle, "::", haystack in needle) + print(haystack, "not in", needle, "::", haystack not in needle) +for needle in (haystack[:i+1] for i in range(len(haystack))): + print(needle, "in", haystack, "::", needle in haystack) + print(needle, "not in", haystack, "::", needle not in haystack) + print(haystack, "in", needle, "::", haystack in needle) + print(haystack, "not in", needle, "::", haystack not in needle) + +# until here, the tests would work without the 'second attempt' iteration thing. + +for i in 1, 2: + for o in [], [1], [1, 2]: + print("{} in {}: {}".format(i, o, i in o)) + print("{} not in {}: {}".format(i, o, i not in o)) diff --git a/tests/basics/tests/exception1.py b/tests/basics/tests/exception1.py new file mode 100644 index 0000000000..95d933de76 --- /dev/null +++ b/tests/basics/tests/exception1.py @@ -0,0 +1,3 @@ +# TODO: requires repr() +#a = IndexError(1, "test", [100, 200]) +#print(repr(a)) |