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

Replace sleep with periodic checks #548

Merged
merged 1 commit into from
Jun 7, 2017
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
50 changes: 21 additions & 29 deletions sd/eureka/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ func TestIntegration(t *testing.T) {
registrar1.Register()
defer registrar1.Deregister()

// This should be enough time for the Eureka server response cache to update.
time.Sleep(time.Second)

// Build a Eureka instancer.
instancer := NewInstancer(
&fargoConnection,
Expand All @@ -55,45 +52,40 @@ func TestIntegration(t *testing.T) {
)
defer instancer.Stop()

// We should have one instance immediately after subscriber instantiation.
state := instancer.state()
if state.Err != nil {
t.Error(state.Err)
}
if want, have := 1, len(state.Instances); want != have {
t.Errorf("want %d, have %d", want, have)
// checks every 100ms (fr up to 10s) for the expected number of instances to be reported
waitForInstances := func(count int) {
for t := 0; t < 100; t++ {
state := instancer.state()
if len(state.Instances) == count {
return
}
time.Sleep(100 * time.Millisecond)
}
state := instancer.state()
if state.Err != nil {
t.Error(state.Err)
}
if want, have := 1, len(state.Instances); want != have {
t.Errorf("want %d, have %d", want, have)
}
}

// We should have one instance immediately after subscriber instantiation.
waitForInstances(1)

// Register a second instance
registrar2 := NewRegistrar(&fargoConnection, instanceTest2, log.With(logger, "component", "registrar2"))
registrar2.Register()
defer registrar2.Deregister() // In case of exceptional circumstances.

// This should be enough time for a scheduled update assuming Eureka is
// configured with the properties mentioned in the function comments.
time.Sleep(2 * time.Second)

// Now we should have two instances.
state = instancer.state()
if state.Err != nil {
t.Error(state.Err)
}
if want, have := 2, len(state.Instances); want != have {
t.Errorf("want %d, have %d", want, have)
}
waitForInstances(2)

// Deregister the second instance.
registrar2.Deregister()

// Wait for another scheduled update.
time.Sleep(2 * time.Second)

// And then there was one.
state = instancer.state()
if state.Err != nil {
t.Error(state.Err)
}
if want, have := 1, len(state.Instances); want != have {
t.Errorf("want %d, have %d", want, have)
}
waitForInstances(1)
}