summaryrefslogtreecommitdiffstatshomepage
path: root/tests/basics/memoryerror.py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-16 10:48:24 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-16 10:48:24 +0100
commit8a919fb051361e422817491c56e9096143b5fe7d (patch)
tree52a318e11957de105ca34deb5fba2669652f2774 /tests/basics/memoryerror.py
parent138114638234677da85baecb64bb18add67e1fd1 (diff)
parent1b997d52441287727ccc61d7541043549d5908ee (diff)
downloadmicropython-8a919fb051361e422817491c56e9096143b5fe7d.tar.gz
micropython-8a919fb051361e422817491c56e9096143b5fe7d.zip
Merge pull request #499 from lurch/skip-travis-tests
run-tests can now skip certain tests when run under Travis CI
Diffstat (limited to 'tests/basics/memoryerror.py')
-rw-r--r--tests/basics/memoryerror.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/basics/memoryerror.py b/tests/basics/memoryerror.py
index e9aa97d858..b4be420c31 100644
--- a/tests/basics/memoryerror.py
+++ b/tests/basics/memoryerror.py
@@ -1,11 +1,6 @@
-# this test for MemoryError can be difficult to reproduce
-# on different machine configurations (notably Travis CI)
-# so we disable it
-# TODO is there a way of testing that we are on Travis CI?
-if False:
- l = list(range(10000))
- try:
- 100000000 * l
- except MemoryError:
- print('MemoryError')
- print(len(l), l[0], l[-1])
+l = list(range(10000))
+try:
+ 100000000 * l
+except MemoryError:
+ print('MemoryError')
+print(len(l), l[0], l[-1])