From 25352198307bcfe617186dd4ce10c4a7316f6d26 Mon Sep 17 00:00:00 2001
From: andri lim <jangko128@gmail.com>
Date: Fri, 10 Jan 2020 20:12:44 +0700
Subject: [PATCH] reenable previously OOM tests

---
 newBlockchainTests.md          |  6 +++---
 tests/test_allowed_to_fail.nim | 33 +++------------------------------
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/newBlockchainTests.md b/newBlockchainTests.md
index 99c746713..dc3af8763 100644
--- a/newBlockchainTests.md
+++ b/newBlockchainTests.md
@@ -2362,7 +2362,7 @@ OK: 9/9 Fail: 0/9 Skip: 0/9
 + static_RETURN_Bounds.json                                       OK
 + static_RETURN_BoundsOOG.json                                    OK
 + static_RawCallGasAsk.json                                       OK
-  static_Return50000_2.json                                       Skip
++ static_Return50000_2.json                                       OK
 + static_ReturnTest.json                                          OK
 + static_ReturnTest2.json                                         OK
 + static_RevertDepth2.json                                        OK
@@ -2536,7 +2536,7 @@ OK: 9/9 Fail: 0/9 Skip: 0/9
 + static_refund_CallToSuicideNoStorage.json                       OK
 + static_refund_CallToSuicideTwice.json                           OK
 ```
-OK: 270/283 Fail: 0/283 Skip: 13/283
+OK: 271/283 Fail: 0/283 Skip: 12/283
 ## stSystemOperationsTest
 ```diff
 + ABAcalls0.json                                                  OK
@@ -3028,4 +3028,4 @@ OK: 133/133 Fail: 0/133 Skip: 0/133
 OK: 130/130 Fail: 0/130 Skip: 0/130
 
 ---TOTAL---
-OK: 2619/2730 Fail: 0/2730 Skip: 111/2730
+OK: 2620/2730 Fail: 0/2730 Skip: 110/2730
diff --git a/tests/test_allowed_to_fail.nim b/tests/test_allowed_to_fail.nim
index cde30de60..655c8cd31 100644
--- a/tests/test_allowed_to_fail.nim
+++ b/tests/test_allowed_to_fail.nim
@@ -89,18 +89,6 @@ func slowGSTTests(folder: string, name: string): bool =
               "CALLBlake2f_MaxRounds.json",
               ]
 
-func failIn32Bits(folder, name: string): bool =
-  return name in @[
-    # crash with OOM
-    "static_Return50000_2.json",
-    "randomStatetest185.json",
-    "randomStatetest159.json",
-    "randomStatetest48.json",
-
-    # OOM in AppVeyor, not on my machine
-    "randomStatetest36.json"
-  ]
-
 func allowedFailingGeneralStateTest(folder, name: string): bool =
   let allowedFailingGeneralStateTests = @[
     # conflicts between native int and big int.
@@ -111,24 +99,14 @@ func allowedFailingGeneralStateTest(folder, name: string): bool =
     # a conflict between balance checker and
     # static call context checker
     "create2noCash.json",
-
-    # Failure once spotted on Travis CI Linux AMD64:
-    # "out of memorysubtest no: 7 failed"
-    # "randomStatetest159.json",
   ]
   result = name in allowedFailingGeneralStateTests
 
-func allowedFailInCurrentBuild(folder, name: string): bool =
-  when sizeof(int) == 4:
-    if failIn32Bits(folder, name):
-      return true
-  return allowedFailingGeneralStateTest(folder, name)
-
 func skipGSTTests*(folder: string, name: string): bool =
   # we skip tests that are slow or expected to fail for now
   if slowGSTTests(folder, name):
     return true
-  result = allowedFailInCurrentBuild(folder, name)
+  result = allowedFailingGeneralStateTest(folder, name)
 
 func skipNewGSTTests*(folder: string, name: string): bool =
   # share the same slow and failing tests
@@ -151,10 +129,8 @@ func skipBCTests*(folder: string, name: string): bool =
     # BlockChain slow tests
     "SuicideIssue.json",
 
-    # BC OOM tests in CI
-    "randomStatetest94.json", # pre istanbul
-
     # BC huge memory consumption
+    "randomStatetest94.json",
     "DelegateCallSpam.json"
   ]
 
@@ -174,15 +150,12 @@ func skipNewBCTests*(folder: string, name: string): bool =
     "RevertInCreateInInitCreate2.json",
     "InitCollision.json",
 
-    # BC OOM tests in CI
-    "randomStatetest94.json",
-    "static_Return50000_2.json", # istanbul
-
     # see allowedFailingGeneralStateTest
     "modexp.json",
     "create2noCash.json",
 
     # BC huge memory consumption
+    "randomStatetest94.json",
     "DelegateCallSpam.json"
   ]