ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5553 from TimeIncOSS/b-fix-retry-err-bug 

helper/resource: Error shouldn't be returned in case of success
This commit is contained in:
Paul Hinze 2016-03-10 08:28:56 -06:00
parent 2dc1c022d3 034287fdc2
commit cadd0c5767
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
helper/resource/wait.go
View File

@ -21,6 +21,7 @@ func Retry(timeout time.Duration, f RetryFunc) error {
Refresh: func() (interface{}, string, error) { Refresh: func() (interface{}, string, error) {
rerr := f() rerr := f()
if rerr == nil { if rerr == nil {
resultErr = nil
return 42, "success", nil return 42, "success", nil
} }

4
helper/resource/wait_test.go
View File

@ -12,14 +12,14 @@ func TestRetry(t *testing.T) {
tries := 0 tries := 0
f := func() *RetryError { f := func() *RetryError {
tries++ tries++
if tries == 1 { if tries == 3 {
return nil return nil
} }
return RetryableError(fmt.Errorf("error")) return RetryableError(fmt.Errorf("error"))
} }
err := Retry(2*time.Second, f) err := Retry(10*time.Second, f)
if err != nil { if err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }