Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions ldclient_end_to_end_fdv2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ func TestFDV2DefaultIsTwoPhaseInit(t *testing.T) {
require.NoError(t, err)
defer client.Close()

assert.Equal(t, string(interfaces.DataSourceStateValid), string(client.GetDataSourceStatusProvider().GetStatus().State))
reached := client.GetDataSourceStatusProvider().WaitFor(interfaces.DataSourceStateValid, time.Second*5)
require.True(t, reached, "timed out waiting for data source to reach VALID state")

value, _ := client.BoolVariation(alwaysTrueFlag.Key, testUser, false)
assert.True(t, value)
Expand Down Expand Up @@ -104,7 +105,8 @@ func TestFDV2CanFallBackToV1(t *testing.T) {
require.NoError(t, err)
defer client.Close()

assert.Equal(t, string(interfaces.DataSourceStateValid), string(client.GetDataSourceStatusProvider().GetStatus().State))
reached := client.GetDataSourceStatusProvider().WaitFor(interfaces.DataSourceStateValid, time.Second*5)
require.True(t, reached, "timed out waiting for data source to reach VALID state")

assertNoMoreRequests(t, pollV2SyncReqCh)
assertNoMoreRequests(t, streamV2SyncReqCh)
Expand Down Expand Up @@ -144,7 +146,8 @@ func TestFDV2StreamingSynchronizer(t *testing.T) {
require.NoError(t, err)
defer client.Close()

assert.Equal(t, string(interfaces.DataSourceStateValid), string(client.GetDataSourceStatusProvider().GetStatus().State))
reached := client.GetDataSourceStatusProvider().WaitFor(interfaces.DataSourceStateValid, time.Second*5)
require.True(t, reached, "timed out waiting for data source to reach VALID state")

value, _ := client.BoolVariation(alwaysTrueFlag.Key, testUser, false)
assert.True(t, value)
Expand Down Expand Up @@ -238,7 +241,8 @@ func TestFDV2StreamingSynchronizeReconnectsWithNonFatalError(t *testing.T) {
require.NoError(t, err)
defer client.Close()

assert.Equal(t, string(interfaces.DataSourceStateValid), string(client.GetDataSourceStatusProvider().GetStatus().State))
reached := client.GetDataSourceStatusProvider().WaitFor(interfaces.DataSourceStateValid, time.Second*5)
require.True(t, reached, "timed out waiting for data source to reach VALID state")

value, _ := client.BoolVariation(alwaysTrueFlag.Key, testUser, false)
assert.True(t, value)
Expand Down Expand Up @@ -402,7 +406,8 @@ func TestFDV2FileInitializerWillDeferToFirstSynchronizer(t *testing.T) {
require.NoError(t, err)
defer client.Close()

assert.Equal(t, string(interfaces.DataSourceStateValid), string(client.GetDataSourceStatusProvider().GetStatus().State))
reached := client.GetDataSourceStatusProvider().WaitFor(interfaces.DataSourceStateValid, time.Second*5)
require.True(t, reached, "timed out waiting for data source to reach VALID state")

value, _ := client.BoolVariation(alwaysTrueFlag.Key, testUser, false)
assert.True(t, value)
Expand Down