Failing list of tests for Web3 (#585)

* Makefile, tests/failing.web3: use failing list to figure out failing tests

* tests/failing.web3: populate failing list

* Makefile, tests/failing.web3: allow running failing web3 tests too

* tests/web3: remove explicit failing directory

* tests/web3: format failing test expected output

Author: ehildenb

Makefile

@@ -44,7 +44,7 @@ export LUA_PATH
         split-tests                                                                                                                                    \
         test test-all test-conformance test-rest-conformance test-all-conformance                                                                      \
         test-vm test-rest-vm test-all-vm test-bchain test-rest-bchain test-all-bchain                                                                  \
-        test-web3                                                                                                                                      \
+        test-web3 test-all-web3 test-failing-web3                                                                                                      \
         test-prove test-prove-benchmarks test-prove-functional test-prove-opcodes test-prove-erc20 test-prove-bihu test-prove-examples test-klab-prove \
         test-parse test-failure                                                                                                                        \
         test-interactive test-interactive-help test-interactive-run test-interactive-prove test-interactive-search test-interactive-firefly            \
@@ -471,10 +471,13 @@ test-all-bchain: $(all_bchain_tests:=.run)
 test-rest-bchain: $(rest_bchain_tests:=.run)
 test-bchain: $(passing_bchain_tests:=.run)
 
-web3_tests=$(wildcard tests/web3/*.in.json) \
-           $(wildcard tests/web3/no-shutdown/*.in.json)
+all_web3_tests     = $(wildcard tests/web3/*.in.json) $(wildcard tests/web3/*/*.in.json)
+failing_web3_tests = $(shell cat tests/failing.web3)
+passing_web3_tests = $(filter-out $(failing_web3_tests), $(all_web3_tests))
 
-test-web3: $(web3_tests:.in.json=.run-web3)
+test-all-web3: $(all_web3_tests:.in.json=.run-web3)
+test-failing-web3: $(failing_web3_tests:.in.json=.run-web3)
+test-web3: $(passing_web3_tests:.in.json=.run-web3)
 
 # Proof Tests
 

tests/failing.web3

@@ -0,0 +1,13 @@
+tests/web3/erc20/erc20capped.in.json
+tests/web3/erc20/erc20capped-partial.in.json
+tests/web3/erc20/erc20detailed.in.json
+tests/web3/erc20/erc20detailed-partial.in.json
+tests/web3/erc20/tokentimelock.in.json
+tests/web3/erc20/tokentimelock-partial.in.json
+tests/web3/eth_getBlockByNumber1Tx-2.in.json
+tests/web3/eth_getBlockByNumberNoTx-2.in.json
+tests/web3/eth_getTransactionReceipt.in.json
+tests/web3/getBlock_multipleAccounts.in.json
+tests/web3/getBlock_multipleTransactions.in.json
+tests/web3/getBlock_singleAccount.in.json
+tests/web3/getBlock_singleTransaction.in.json

tests/web3/failing/eth_getBlockByNumber1Tx.expected.json renamed to tests/web3/eth_getBlockByNumber1Tx-2.expected.json

@@ -0,0 +1,33 @@
+[
+  {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": true
+  },
+  {
+    "jsonrpc": "2.0",
+    "id": 2,
+    "result": "0x48b3bce222588aff4329c7c7aebaa39ffb66045254c1ca16b9b1a5482463682b"
+  },
+  {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": {
+      "transactionHash": "0x48b3bce222588aff4329c7c7aebaa39ffb66045254c1ca16b9b1a5482463682b",
+      "transactionIndex": "0x0",
+      "blockHash": "0xef122182b5260879e82a5495c5dbe57ebcf6f8b2cb8b6cf50dbfc96a1d39b776",
+      "blockNumber": "0x1",
+      "from": "0x79a59cf0083efdf696befda81655104787f938d0",
+      "to": null,
+      "gasUsed": "0xeaca",
+      "cumulativeGasUsed": "0xeaca",
+      "contractAddress": "0xe7f1941dc335305fc2799b72417243dc3f375179",
+      "logs": [],
+      "status": "0x1",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "v": "0x1b",
+      "r": "0xb6b98a3170b0ad5db2792d2314aa3435b8bdbb26c35d495a2aab893113904a41",
+      "s": "0x5bade5f3b478a7986d8933911866c324a1e5fb7839207c6cc631dead3f88063b"
+    }
+  }
+]