From 16d40d52ef22c3fa047a836de080291b0bcd2fc9 Mon Sep 17 00:00:00 2001 From: Jason Carver Date: Mon, 29 Mar 2021 09:30:34 -0700 Subject: [PATCH] Upgrade ethereum tests to v8.0.2 Some new (or moved?) tests are too slow and break CI --- fixtures | 2 +- newsfragments/1998.internal.rst | 1 + .../blockchain/test_blockchain.py | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 newsfragments/1998.internal.rst diff --git a/fixtures b/fixtures index e431795bf7..ff68495eb5 160000 --- a/fixtures +++ b/fixtures @@ -1 +1 @@ -Subproject commit e431795bf750166671afc3516f5e0332af3318f1 +Subproject commit ff68495eb56c382b2ddcea4020259e106353b874 diff --git a/newsfragments/1998.internal.rst b/newsfragments/1998.internal.rst new file mode 100644 index 0000000000..311f2eeccb --- /dev/null +++ b/newsfragments/1998.internal.rst @@ -0,0 +1 @@ +Update ethereum/tests fixture to v8.0.2, mark some new tests as too slow for CI. diff --git a/tests/json-fixtures/blockchain/test_blockchain.py b/tests/json-fixtures/blockchain/test_blockchain.py index afd81ece94..107d764716 100644 --- a/tests/json-fixtures/blockchain/test_blockchain.py +++ b/tests/json-fixtures/blockchain/test_blockchain.py @@ -148,6 +148,24 @@ ('GeneralStateTests/stZeroKnowledge/pairingTest.json', 'pairingTest_d4g0v0_Istanbul'), # noqa: E501 ('GeneralStateTests/stZeroKnowledge/pairingTest.json', 'pairingTest_d5g0v0_Istanbul'), # noqa: E501 ('GeneralStateTests/stZeroKnowledge/pairingTest.json', 'pairingTest_d5g3v0_Istanbul'), # noqa: E501 + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d8g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d10g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d11g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d12g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d13g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d14g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d8g0v0_Berlin'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d10g0v0_Berlin'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d11g0v0_Berlin'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d12g0v0_Berlin'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d13g0v0_Berlin'), + ('GeneralStateTests/VMTests/vmPerformance/loopExp.json', 'loopExp_d14g0v0_Berlin'), + ('GeneralStateTests/VMTests/vmPerformance/loopMul.json', 'loopMul_d0g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopMul.json', 'loopMul_d1g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopMul.json', 'loopMul_d2g0v0_Istanbul'), + ('GeneralStateTests/VMTests/vmPerformance/loopMul.json', 'loopMul_d0g0v0_Berlin'), + ('GeneralStateTests/VMTests/vmPerformance/loopMul.json', 'loopMul_d1g0v0_Berlin'), + ('GeneralStateTests/VMTests/vmPerformance/loopMul.json', 'loopMul_d2g0v0_Berlin'), ('InvalidBlocks/bcForgedTest/bcForkBlockTest.json', 'BlockWrongResetGas'), # noqa: E501 ('InvalidBlocks/bcForgedTest/bcInvalidRLPTest.json', 'BLOCK_difficulty_TooLarge'), # noqa: E501 ('InvalidBlocks/bcMultiChainTest/UncleFromSideChain.json', 'UncleFromSideChain_Constantinople'), # noqa: E501