Simplify test.
This commit is contained in:
parent
6bb37c56be
commit
0015b68be5
|
@ -167,7 +167,6 @@ func TestReloadFailure(t *testing.T) {
|
||||||
// Create a file with no permissions
|
// Create a file with no permissions
|
||||||
ioutil.WriteFile(filename, []byte("second body"), 0)
|
ioutil.WriteFile(filename, []byte("second body"), 0)
|
||||||
fakeTick <- time.Now()
|
fakeTick <- time.Now()
|
||||||
fakeTick <- time.Now()
|
|
||||||
select {
|
select {
|
||||||
case r := <-reloads:
|
case r := <-reloads:
|
||||||
if r.err == nil {
|
if r.err == nil {
|
||||||
|
@ -186,18 +185,16 @@ func TestReloadFailure(t *testing.T) {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
fakeTick <- time.Now()
|
fakeTick <- time.Now()
|
||||||
for {
|
select {
|
||||||
select {
|
case r := <-reloads:
|
||||||
case r := <-reloads:
|
if r.err != nil {
|
||||||
if r.err != nil {
|
t.Errorf("Unexpected error: %s", err)
|
||||||
continue
|
|
||||||
}
|
|
||||||
if string(r.b) != "third body" {
|
|
||||||
t.Errorf("Expected 'third body' reading file after restoring it.")
|
|
||||||
}
|
|
||||||
return
|
|
||||||
case <-time.After(5 * time.Second):
|
|
||||||
t.Fatalf("timed out waiting for successful reload")
|
|
||||||
}
|
}
|
||||||
|
if string(r.b) != "third body" {
|
||||||
|
t.Errorf("Expected 'third body' reading file after restoring it.")
|
||||||
|
}
|
||||||
|
return
|
||||||
|
case <-time.After(5 * time.Second):
|
||||||
|
t.Fatalf("timed out waiting for successful reload")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue