Skip to content

test(ldtestdata): increase channel-wait timeouts to reduce CI flakiness #420

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

Open
aaron-zeisler wants to merge 1 commit into
base: v7
Choose a base branch
from
+10 −10
Open

test(ldtestdata): increase channel-wait timeouts to reduce CI flakiness #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion testhelpers/ldtestdata/test_data_source_flag_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func verifyFlag(t *testing.T, configureFlag func(*FlagBuilder), expectedFlag *ld
f := p.td.Flag("flagkey")
configureFlag(f)
p.td.Update(f)
up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), "flagkey", 1, time.Millisecond)
up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), "flagkey", 1, time.Second)
upJSON := ldstoreimpl.Features().Serialize(up.Item)
m.In(t).Assert(string(upJSON), m.JSONStrEqual(string(expectedJSON)))
})
Expand Down
18 changes: 9 additions & 9 deletions testhelpers/ldtestdata/test_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (p testDataSourceTestParams) withDataSource(t *testing.T, action func(subsy

closer := make(chan struct{})
ds.Start(closer)
if !th.AssertChannelClosed(t, closer, time.Millisecond, "start did not close channel") {
if !th.AssertChannelClosed(t, closer, time.Second, "start did not close channel") {
t.FailNow()
}
p.updates.RequireStatusOf(t, interfaces.DataSourceStateValid)
Expand All @@ -62,7 +62,7 @@ func TestTestDataSource(t *testing.T) {
testDataSourceTest(t, func(p testDataSourceTestParams) {
p.withDataSource(t, func(ds subsystems.DataSource) {
expectedData := ldservices.NewServerSDKData()
p.updates.DataStore.WaitForInit(t, expectedData, time.Millisecond)
p.updates.DataStore.WaitForInit(t, expectedData, time.Second)
assert.True(t, ds.IsInitialized())
})
})
Expand All @@ -74,7 +74,7 @@ func TestTestDataSource(t *testing.T) {
Update(p.td.Flag("flag2").On(false))

p.withDataSource(t, func(subsystems.DataSource) {
initData := p.updates.DataStore.WaitForNextInit(t, time.Millisecond)
initData := p.updates.DataStore.WaitForNextInit(t, time.Second)
dataMap := sharedtest.DataSetToMap(initData)
require.Len(t, dataMap, 2)
flags := dataMap[ldstoreimpl.Features()]
Expand All @@ -93,7 +93,7 @@ func TestTestDataSource(t *testing.T) {
p.withDataSource(t, func(subsystems.DataSource) {
p.td.Update(p.td.Flag("flag1").On(true))

up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), "flag1", 1, time.Millisecond)
up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), "flag1", 1, time.Second)
assert.True(t, up.Item.Item.(*ldmodel.FeatureFlag).On)
})
})
Expand All @@ -106,7 +106,7 @@ func TestTestDataSource(t *testing.T) {
p.withDataSource(t, func(subsystems.DataSource) {
p.td.Update(p.td.Flag("flag1").On(true))

up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), "flag1", 2, time.Millisecond)
up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), "flag1", 2, time.Second)
assert.True(t, up.Item.Item.(*ldmodel.FeatureFlag).On)
})
})
Expand All @@ -130,7 +130,7 @@ func TestTestDataSource(t *testing.T) {
p.withDataSource(t, func(subsystems.DataSource) {
p.td.UsePreconfiguredFlag(flagv1)

up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), flagv1.Key, 1, time.Millisecond)
up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), flagv1.Key, 1, time.Second)
assert.Equal(t, &flagv1, up.Item.Item.(*ldmodel.FeatureFlag))

updatedFlag := flagv1
Expand All @@ -139,7 +139,7 @@ func TestTestDataSource(t *testing.T) {
expectedFlagV2.Version = 2
p.td.UsePreconfiguredFlag(updatedFlag)

up = p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), flagv1.Key, 2, time.Millisecond)
up = p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Features(), flagv1.Key, 2, time.Second)
assert.Equal(t, &expectedFlagV2, up.Item.Item.(*ldmodel.FeatureFlag))
})
})
Expand All @@ -151,7 +151,7 @@ func TestTestDataSource(t *testing.T) {
p.withDataSource(t, func(subsystems.DataSource) {
p.td.UsePreconfiguredSegment(segmentv1)

up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Segments(), segmentv1.Key, 1, time.Millisecond)
up := p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Segments(), segmentv1.Key, 1, time.Second)
assert.Equal(t, &segmentv1, up.Item.Item.(*ldmodel.Segment))

updatedSegment := segmentv1
Expand All @@ -160,7 +160,7 @@ func TestTestDataSource(t *testing.T) {
expectedSegmentV2.Version = 2
p.td.UsePreconfiguredSegment(updatedSegment)

up = p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Segments(), segmentv1.Key, 2, time.Millisecond)
up = p.updates.DataStore.WaitForUpsert(t, ldstoreimpl.Segments(), segmentv1.Key, 2, time.Second)
assert.Equal(t, &expectedSegmentV2, up.Item.Item.(*ldmodel.Segment))
})
})
Expand Down
Loading