Skip to content

Fix random failures TestWaitAndAddConnectionTimeLongtWindow #2903

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.

Sign up for GitHub

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

Merged
tsachiherman merged 2 commits into from
Sep 17, 2021
Merged

Fix random failures TestWaitAndAddConnectionTimeLongtWindow #2903

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f52384e
TestWaitAndAddConnectionTimeLongtWindow replace sleep with simulated
algonautshant Sep 17, 2021
a11b10b
Fix lint
algonautshant Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 26 additions & 8 deletions network/phonebook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,12 @@ func TestMultiPhonebookDuplicateFiltering(t *testing.T) {
func TestWaitAndAddConnectionTimeLongtWindow(t *testing.T) {
partitiontest.PartitionTest(t)

entries := MakePhonebook(3, 200*time.Millisecond).(*phonebookImpl)
// make the connectionsRateLimitingWindow long enough to avoid triggering it when the
// test is running in a slow environment
// The test will artificially simulate time passing
timeUnit := 2000 * time.Second
connectionsRateLimitingWindow := 2 * timeUnit
entries := MakePhonebook(3, connectionsRateLimitingWindow).(*phonebookImpl)
addr1 := "addrABC"
addr2 := "addrXYZ"

Expand All @@ -259,8 +264,10 @@ func TestWaitAndAddConnectionTimeLongtWindow(t *testing.T) {
phBookData := entries.data[addr1].recentConnectionTimes
require.Equal(t, 1, len(phBookData))

// introduce a gap between the two requests
time.Sleep(100 * time.Millisecond)
// simulate passing a unit of time
for rct := range entries.data[addr1].recentConnectionTimes {
entries.data[addr1].recentConnectionTimes[rct] = entries.data[addr1].recentConnectionTimes[rct].Add(-1 * timeUnit)
}

// add another value to addr
addrInPhonebook, waitTime, provisionalTime = entries.GetConnectionWaitTime(addr1)
Expand All @@ -269,8 +276,11 @@ func TestWaitAndAddConnectionTimeLongtWindow(t *testing.T) {
phBookData = entries.data[addr1].recentConnectionTimes
require.Equal(t, 2, len(phBookData))

// wait for the time the first element should be removed
time.Sleep(100 * time.Millisecond)
// simulate passing a unit of time
for rct := range entries.data[addr1].recentConnectionTimes {
entries.data[addr1].recentConnectionTimes[rct] =
entries.data[addr1].recentConnectionTimes[rct].Add(-1 * timeUnit)
}

// the first time should be removed and a new one added
// there should not be any wait
Expand All @@ -294,7 +304,11 @@ func TestWaitAndAddConnectionTimeLongtWindow(t *testing.T) {
require.Equal(t, true, entries.UpdateConnectionTime(addr2, provisionalTime))

// introduce a gap between the two requests so that only the first will be removed later when waited
time.Sleep(100 * time.Millisecond)
// simulate passing a unit of time
for rct := range entries.data[addr2].recentConnectionTimes {
entries.data[addr2].recentConnectionTimes[rct] =
entries.data[addr2].recentConnectionTimes[rct].Add(-1 * timeUnit)
}

// value 2
addrInPhonebook, waitTime, provisionalTime = entries.GetConnectionWaitTime(addr2)
Expand All @@ -318,15 +332,19 @@ func TestWaitAndAddConnectionTimeLongtWindow(t *testing.T) {
require.Equal(t, phBookData[1], phBookData2[1])
require.Equal(t, phBookData[2], phBookData2[2])

time.Sleep(waitTime)
// simulate passing of the waitTime duration
for rct := range entries.data[addr2].recentConnectionTimes {
entries.data[addr2].recentConnectionTimes[rct] =
entries.data[addr2].recentConnectionTimes[rct].Add(-1 * waitTime)
}

// The wait should be sufficient
_, waitTime, provisionalTime = entries.GetConnectionWaitTime(addr2)
require.Equal(t, time.Duration(0), waitTime)
require.Equal(t, true, entries.UpdateConnectionTime(addr2, provisionalTime))
// only one element should be removed, and one added
phBookData2 = entries.data[addr2].recentConnectionTimes
require.Equal(t, 3, len(phBookData))
require.Equal(t, 3, len(phBookData2))

// make sure the right time was removed
require.Equal(t, phBookData[1], phBookData2[0])
Expand Down