From b28e1d574615d825acbd143dab52a39bbf956445 Mon Sep 17 00:00:00 2001 From: Bernd Date: Wed, 9 Aug 2023 15:25:10 +0200 Subject: [PATCH] Remove option happy-path-only, short-happy-path --- Makefile | 6 +++--- tests/e2e/main.go | 19 +------------------ 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 28c02f7c85..bae7848e9a 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ test-diff: # run only happy path E2E tests test-e2e-short: - go run ./tests/e2e/... --happy-path-only + go run ./tests/e2e/... --tc happy-path # run full E2E tests in sequence (including multiconsumer) test-e2e-multi-consumer: @@ -47,7 +47,7 @@ test-gaia-e2e: # run only happy path E2E tests using latest tagged gaia test-gaia-e2e-short: - go run ./tests/e2e/... --happy-path-only --use-gaia + go run ./tests/e2e/... --tc happy-path --use-gaia # run full E2E tests in parallel (including multiconsumer) using latest tagged gaia test-gaia-e2e-parallel: @@ -61,7 +61,7 @@ test-gaia-e2e-tagged: # run only happy path E2E tests using latest tagged gaia # usage: GAIA_TAG=v9.0.0 make test-gaia-e2e-short-tagged test-gaia-e2e-short-tagged: - go run ./tests/e2e/... --happy-path-only --use-gaia --gaia-tag $(GAIA_TAG) + go run ./tests/e2e/... --tc happy-path --use-gaia --gaia-tag $(GAIA_TAG) # run full E2E tests in parallel (including multiconsumer) using specific tagged version of gaia # usage: GAIA_TAG=v9.0.0 make test-gaia-e2e-parallel-tagged diff --git a/tests/e2e/main.go b/tests/e2e/main.go index b185727444..c6d831cc49 100644 --- a/tests/e2e/main.go +++ b/tests/e2e/main.go @@ -34,13 +34,7 @@ func (t *TestSet) String() string { } var ( - verbose = flag.Bool("verbose", false, "turn verbose logging on/off") - happyPathOnly = flag.Bool("happy-path-only", false, "run happy path tests only") - shortHappyPathOnly = flag.Bool("short-happy-path", false, `run abridged happy path tests only. -This is like the happy path, but skips steps -that involve starting or stopping nodes for the same chain outside of the chain setup or teardown. -In particular, this skips steps related to downtime and double signing. -This is suited for CometMock+Gorelayer testing`) + verbose = flag.Bool("verbose", false, "turn verbose logging on/off") includeMultiConsumer = flag.Bool("include-multi-consumer", false, "include multiconsumer tests in run") parallel = flag.Bool("parallel", false, "run all tests in parallel") localSdkPath = flag.String("local-sdk-path", "", @@ -122,17 +116,6 @@ func parseArguments() (err error) { } func getTestCases(selection TestSet) (tests []testRunWithSteps) { - - if shortHappyPathOnly != nil && *shortHappyPathOnly { - tests = append(tests, *testMap["happy-path-short"]) - return - } - - if happyPathOnly != nil && *happyPathOnly { - tests = append(tests, *testMap["happy-path"]) - return - } - // Run default tests if no test cases were selected if len(selection) == 0 { selection = TestSet{"changeover", "happy-path",