Merge pull request #6650 from josephholsten/atlas-timeout-errmsg

master: atlas: update test err msg to reflect real timeout
2016-05-12 20:18:57 -05:00 · 2016-05-12 20:18:57 -05:00 · 2bca697a12
parent fecacb5e10 546fb94265
commit 2bca697a12
1 changed files with 1 additions and 1 deletions
--- a/state/remote/atlas_test.go
+++ b/state/remote/atlas_test.go
@ -160,7 +160,7 @@ func TestAtlasClient_UnresolvableConflict(t *testing.T) {
 	case <-doneCh:
 		// OK
 	case <-time.After(500 * time.Millisecond):
-		t.Fatalf("Timed out after 50ms, probably because retrying infinitely.")
+		t.Fatalf("Timed out after 500ms, probably because retrying infinitely.")
 	}
 }