From cb9ac6282f170dad6ff9d54c6a3c68eb6d9d080c Mon Sep 17 00:00:00 2001 From: Ivan Martinez Date: Sun, 29 Mar 2020 01:54:13 -0400 Subject: [PATCH] Separate anti flakes to prevent E2E issues (#5238) * Separate anti flakes * Gaz --- endtoend/BUILD.bazel | 3 +- ...est.go => minimal_antiflake_e2e_1_test.go} | 4 +-- endtoend/minimal_antiflake_e2e_2_test.go | 33 +++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) rename endtoend/{minimal_antiflake_e2e_test.go => minimal_antiflake_e2e_1_test.go} (81%) create mode 100644 endtoend/minimal_antiflake_e2e_2_test.go diff --git a/endtoend/BUILD.bazel b/endtoend/BUILD.bazel index 3f8e4ed8ff7..6901bf3d06f 100644 --- a/endtoend/BUILD.bazel +++ b/endtoend/BUILD.bazel @@ -6,7 +6,8 @@ go_test( testonly = True, srcs = [ "endtoend_test.go", - "minimal_antiflake_e2e_test.go", + "minimal_antiflake_e2e_1_test.go", + "minimal_antiflake_e2e_2_test.go", "minimal_e2e_test.go", "minimal_slashing_e2e_test.go", ], diff --git a/endtoend/minimal_antiflake_e2e_test.go b/endtoend/minimal_antiflake_e2e_1_test.go similarity index 81% rename from endtoend/minimal_antiflake_e2e_test.go rename to endtoend/minimal_antiflake_e2e_1_test.go index f0e510e73d5..5b8914f49d7 100644 --- a/endtoend/minimal_antiflake_e2e_test.go +++ b/endtoend/minimal_antiflake_e2e_1_test.go @@ -10,7 +10,7 @@ import ( "github.com/prysmaticlabs/prysm/shared/testutil" ) -func TestEndToEnd_AntiFlake_MinimalConfig(t *testing.T) { +func TestEndToEnd_AntiFlake_MinimalConfig_1(t *testing.T) { testutil.ResetCache() params.UseMinimalConfig() @@ -29,7 +29,5 @@ func TestEndToEnd_AntiFlake_MinimalConfig(t *testing.T) { t.Fatal(err) } - // Running this test twice to test the quickest conditions (3 epochs) twice. - runEndToEndTest(t, minimalConfig) runEndToEndTest(t, minimalConfig) } diff --git a/endtoend/minimal_antiflake_e2e_2_test.go b/endtoend/minimal_antiflake_e2e_2_test.go new file mode 100644 index 00000000000..547ea487695 --- /dev/null +++ b/endtoend/minimal_antiflake_e2e_2_test.go @@ -0,0 +1,33 @@ +package endtoend + +import ( + "testing" + + ev "github.com/prysmaticlabs/prysm/endtoend/evaluators" + e2eParams "github.com/prysmaticlabs/prysm/endtoend/params" + "github.com/prysmaticlabs/prysm/endtoend/types" + "github.com/prysmaticlabs/prysm/shared/params" + "github.com/prysmaticlabs/prysm/shared/testutil" +) + +func TestEndToEnd_AntiFlake_MinimalConfig_2(t *testing.T) { + testutil.ResetCache() + params.UseMinimalConfig() + + minimalConfig := &types.E2EConfig{ + BeaconFlags: []string{"--minimal-config", "--custom-genesis-delay=10"}, + ValidatorFlags: []string{"--minimal-config"}, + EpochsToRun: 3, + TestSync: false, + TestSlasher: false, + Evaluators: []types.Evaluator{ + ev.PeersConnect, + ev.ValidatorsAreActive, + }, + } + if err := e2eParams.Init(4); err != nil { + t.Fatal(err) + } + + runEndToEndTest(t, minimalConfig) +}