Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor e2e testing and improve coverage #1204

Merged
merged 25 commits into from May 6, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -364,9 +364,9 @@ install-ci-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EXTEN
--set evaluator.hostName=test \
--set evaluator.grpcPort=50509 \
--set evaluator.httpPort=51509 \
--set open-match-core.registrationIntervalMs=100ms \
Laremere marked this conversation as resolved.
Show resolved Hide resolved
--set open-match-core.proposalCollectionIntervalMs=100ms \
--set open-match-core.ignoreListTTL=100ms \
--set open-match-core.registrationIntervalMs=200ms \
--set open-match-core.proposalCollectionIntervalMs=200ms \
--set open-match-core.ignoreListTTL=200ms \
--set open-match-core.pageSize=10 \
--set global.gcpProjectId=intentionally-invalid-value \
--set redis.master.resources.requests.cpu=0.6,redis.master.resources.requests.memory=300Mi \
Expand Down
6 changes: 3 additions & 3 deletions internal/testing/e2e/common.go
Expand Up @@ -201,11 +201,11 @@ api:


synchronizer:
registrationIntervalMs: 100ms
proposalCollectionIntervalMs: 100ms
registrationIntervalMs: 200ms
proposalCollectionIntervalMs: 200ms

storage:
ignoreListTTL: 100ms
ignoreListTTL: 200ms
page:
size: 10

Expand Down
12 changes: 6 additions & 6 deletions internal/testing/e2e/fetch_matches_test.go
Expand Up @@ -445,7 +445,7 @@ func TestCancel(t *testing.T) {
wgFinished.Wait()

// The evaluator is only canceled after the registration window completes.
require.True(t, time.Since(startTime) > time.Millisecond*100, "%s", time.Since(startTime))
require.True(t, time.Since(startTime) > time.Millisecond*200, "%s", time.Since(startTime))
}

// TestStreaming covers that matches can stream through the mmf, evaluator, and
Expand Down Expand Up @@ -529,7 +529,7 @@ func TestRegistrationWindow(t *testing.T) {
_, ok := <-in
require.False(t, ok)

require.True(t, time.Since(startTime) > time.Millisecond*100, "%s", time.Since(startTime))
Laremere marked this conversation as resolved.
Show resolved Hide resolved
require.True(t, time.Since(startTime) > time.Millisecond*200, "%s", time.Since(startTime))
return nil
})

Expand All @@ -542,7 +542,7 @@ func TestRegistrationWindow(t *testing.T) {
resp, err := stream.Recv()
require.Equal(t, err, io.EOF)
require.Nil(t, resp)
require.True(t, time.Since(startTime) > time.Millisecond*100, "%s", time.Since(startTime))
require.True(t, time.Since(startTime) > time.Millisecond*200, "%s", time.Since(startTime))
}

// TestProposalWindowClose covers that a long running match function will get
Expand All @@ -556,14 +556,14 @@ func TestProposalWindowClose(t *testing.T) {
om.SetMMF(func(ctx context.Context, profile *pb.MatchProfile, out chan<- *pb.Match) error {
<-ctx.Done()
require.Equal(t, ctx.Err(), context.Canceled)
require.True(t, time.Since(startTime) > time.Millisecond*200, "%s", time.Since(startTime))
require.True(t, time.Since(startTime) > time.Millisecond*400, "%s", time.Since(startTime))
return nil
})

om.SetEvaluator(func(ctx context.Context, in <-chan *pb.Match, out chan<- string) error {
_, ok := <-in
require.False(t, ok)
require.True(t, time.Since(startTime) > time.Millisecond*200, "%s", time.Since(startTime))
require.True(t, time.Since(startTime) > time.Millisecond*400, "%s", time.Since(startTime))
return nil
})

Expand All @@ -577,7 +577,7 @@ func TestProposalWindowClose(t *testing.T) {
require.Contains(t, err.Error(), "context canceled")
require.Nil(t, resp)

require.True(t, time.Since(startTime) > time.Millisecond*200, "%s", time.Since(startTime))
require.True(t, time.Since(startTime) > time.Millisecond*400, "%s", time.Since(startTime))
}

// TestMultipleFetchCalls covers multiple fetch matches calls running in the
Expand Down
4 changes: 2 additions & 2 deletions internal/testing/e2e/ticket_test.go
Expand Up @@ -304,7 +304,7 @@ func TestReleaseTickets(t *testing.T) {

// Ensure that the release timeout did NOT have enough time to affect this
// test.
require.True(t, time.Since(matchReturnedAt) < time.Millisecond*100, "%s", time.Since(matchReturnedAt))
require.True(t, time.Since(matchReturnedAt) < time.Millisecond*200, "%s", time.Since(matchReturnedAt))
}

// TestReleaseTickets covers that tickets are released after a time if returned
Expand Down Expand Up @@ -383,7 +383,7 @@ func TestTicketReleaseByTimeout(t *testing.T) {
}

{ // Return ticket
time.Sleep(time.Millisecond * 100)
time.Sleep(time.Millisecond * 200)
}

{ // Ticket present in query
Expand Down