From 0015b68be51fc691c8d16883327b76b87fea1e0e Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Mon, 14 Mar 2016 17:19:48 -0700
Subject: [PATCH] Simplify test.

---
 reloader/reloader_test.go | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/reloader/reloader_test.go b/reloader/reloader_test.go
index 81d167f0a..555671b1c 100644
--- a/reloader/reloader_test.go
+++ b/reloader/reloader_test.go
@@ -167,7 +167,6 @@ func TestReloadFailure(t *testing.T) {
 	// Create a file with no permissions
 	ioutil.WriteFile(filename, []byte("second body"), 0)
 	fakeTick <- time.Now()
-	fakeTick <- time.Now()
 	select {
 	case r := <-reloads:
 		if r.err == nil {
@@ -186,18 +185,16 @@ func TestReloadFailure(t *testing.T) {
 		t.Fatal(err)
 	}
 	fakeTick <- time.Now()
-	for {
-		select {
-		case r := <-reloads:
-			if r.err != nil {
-				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")
+	select {
+	case r := <-reloads:
+		if r.err != nil {
+			t.Errorf("Unexpected error: %s", err)
 		}
+		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")
 	}
 }