Merge pull request #499 from lurch/skip-travis-tests

run-tests can now skip certain tests when run under Travis CI

1 files changed, 6 insertions, 11 deletions

diff --git a/tests/basics/memoryerror.py b/tests/basics/memoryerror.py
index e9aa97d85..b4be420c3 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])