Fix rebase introduced errors

Signed-off-by: Frank Hamand <frankhamand@gmail.com>
pull/4144/head
Frank Hamand 7 years ago
parent 71e6210e53
commit 9c294bde84
No known key found for this signature in database
GPG Key ID: 3A94326B72FE75DF

@ -135,10 +135,11 @@ func (t *test) run(env *Environment) error {
resourceCleanExit := true resourceCleanExit := true
status := v1.PodUnknown status := v1.PodUnknown
if resourceCreated { if resourceCreated {
status, err = env.getTestPodStatus(test) var err error
status, err = env.getTestPodStatus(t)
if err != nil { if err != nil {
resourceCleanExit = false resourceCleanExit = false
if streamErr := env.streamError(test.result.Info); streamErr != nil { if streamErr := env.streamError(t.result.Info); streamErr != nil {
return streamErr return streamErr
} }
} }

@ -443,10 +443,10 @@ func newSleepOnWaitKubeClient() *sleepOnWaitKubeClient {
} }
} }
func (p *sleepOnWaitKubeClient) WaitAndGetCompletedPodPhase(ns string, r io.Reader, timeout time.Duration) (core.PodPhase, error) { func (p *sleepOnWaitKubeClient) WaitAndGetCompletedPodPhase(ns string, r io.Reader, timeout time.Duration) (v1.PodPhase, error) {
time.Sleep(1 * time.Millisecond) time.Sleep(1 * time.Millisecond)
return core.PodSucceeded, nil return v1.PodSucceeded, nil
} }
type podFailedKubeClient struct { type podFailedKubeClient struct {

Loading…
Cancel
Save