Skip to content

Commit

Permalink
fix(e2e): DeFlake E2E Tests argoproj#1647 (argoproj#1648)
Browse files Browse the repository at this point in the history
Signed-off-by: Rohit Agrawal <[email protected]>
  • Loading branch information
agrawroh authored and danielm-codefresh committed Mar 3, 2022
1 parent d6131a6 commit 197f9db
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ DEV_IMAGE=false
# E2E variables
E2E_INSTANCE_ID ?= argo-rollouts-e2e
E2E_TEST_OPTIONS ?=
E2E_PARALLEL ?= 1
E2E_PARALLEL ?= 4

override LDFLAGS += \
-X ${PACKAGE}/utils/version.version=${VERSION} \
Expand Down Expand Up @@ -244,7 +244,7 @@ start-e2e:

.PHONY: test-e2e
test-e2e:
go test -timeout 20m -v -count 1 --tags e2e -p ${E2E_PARALLEL} --short ./test/e2e ${E2E_TEST_OPTIONS}
go test -timeout 30m -v -count 1 --tags e2e -p ${E2E_PARALLEL} --short ./test/e2e ${E2E_TEST_OPTIONS}

.PHONY: coverage
coverage: test
Expand Down
4 changes: 4 additions & 0 deletions test/e2e/analysis_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build e2e
// +build e2e

package e2e
Expand Down Expand Up @@ -450,6 +451,7 @@ spec:
args: null
`).
WaitForRolloutStatus("Paused").
Sleep(2*time.Second). // Give some time before validating the scaling down event
Then().
ExpectRevisionPodCount("1", 1).
ExpectRevisionScaleDown("2", true).
Expand All @@ -459,6 +461,7 @@ spec:
When().
PromoteRollout().
WaitForRolloutStatus("Healthy").
Sleep(2*time.Second). // Give some time before validating the scaling down event
Then().
ExpectRevisionPodCount("1", 1).
ExpectRevisionScaleDown("1", true).
Expand Down Expand Up @@ -714,6 +717,7 @@ func (s *AnalysisSuite) TestBackgroundAnalysisWithArgs() {
When().
UpdateSpec().
WaitForRolloutStatus("Paused").
Sleep(3 * time.Second). // Give some time before validating that AnalysisRun got kicked off
Then().
ExpectAnalysisRunCount(1).
ExpectBackgroundAnalysisRunPhase("Running").
Expand Down

0 comments on commit 197f9db

Please sign in to comment.