fix: add custom wait for retry logic

[Shubhranshu153]

Issue #, if available:

Description of changes:
Add a custom wait logic as the wait for goexec has an assertion, that marks the test fail in case of timeout.
eventually is usually also used with an assertion.
Without the wait logic the retry wont work due to assertion

Testing done:

• I've reviewed the guidance in CONTRIBUTING.md

License Acceptance

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

[pendo324]

Description of changes: Add a custom wait logic as the wait for goexec has an assertion, that marks the test fail in case of timeout. eventually is usually also used with an assertion. Without the wait logic the retry wont work due to assertion

I skimmed through gexec's source and couldn't find the assertion you mentioned. Can you post a link in case something like this happens again?

[Shubhranshu153]

/*
Wait waits until the wrapped command exits.  It can be passed an optional timeout.
If the command does not exit within the timeout, Wait will trigger a test failure.

Wait returns the session, making it possible to chain:

	session.Wait().Out.Contents()

will wait for the command to exit then return the entirety of Out's contents.

Wait uses eventually under the hood and accepts the same timeout/polling intervals that eventually does.
*/
func (s *Session) Wait(timeout ...interface{}) *Session {
	EventuallyWithOffset(1, s, timeout...).Should(Exit())
	return s
}

its goexec internals.

[pendo324]

/*

Wait waits until the wrapped command exits.  It can be passed an optional timeout.

If the command does not exit within the timeout, Wait will trigger a test failure.



Wait returns the session, making it possible to chain:



	session.Wait().Out.Contents()



will wait for the command to exit then return the entirety of Out's contents.



Wait uses eventually under the hood and accepts the same timeout/polling intervals that eventually does.

*/

func (s *Session) Wait(timeout ...interface{}) *Session {

	EventuallyWithOffset(1, s, timeout...).Should(Exit())

	return s

}

its goexec internals.

I see, it either exits before timeout, or it fails due to the .Should(Exit())

[Shubhranshu153]

yes

[pendo324]

I think this might be a little easier to read, lmk what you think

exitCodeChan := make(chan int)
exitCode := -1
for i := 0; i < retryPull && exitCode != 0; i++ {
	go func(retry int) {
		s := command.New(o, "pull", ref).WithoutWait().Run()
		for {
			select {
			case <-s.Exited:
				fmt.Printf("\nExited (attempt %d)\n", retry)
				exitCodeChan <- s.ExitCode()
				return
			case <-time.After(30 * time.Second):
				fmt.Printf("\nTimed out (attempt %d)\n", retry)
				exitCodeChan <- -1
				s.Interrupt().Kill()
				return
			}
		}
	}(i)

	exitCode = <-exitCodeChan
}

if exitCode != 0 {
	ginkgo.Fail(fmt.Sprintf("Failed to pull image: %s", ref))
}

[Shubhranshu153]

simplified the code.