From 9c294bde849bdf6cb35d64e38b80ab166e5ad593 Mon Sep 17 00:00:00 2001 From: Frank Hamand Date: Fri, 9 Nov 2018 15:53:52 +0000 Subject: [PATCH] Fix rebase introduced errors Signed-off-by: Frank Hamand --- pkg/releasetesting/test_suite.go | 5 +++-- pkg/releasetesting/test_suite_test.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/releasetesting/test_suite.go b/pkg/releasetesting/test_suite.go index c9ef54ed6..4fa5de526 100644 --- a/pkg/releasetesting/test_suite.go +++ b/pkg/releasetesting/test_suite.go @@ -135,10 +135,11 @@ func (t *test) run(env *Environment) error { resourceCleanExit := true status := v1.PodUnknown if resourceCreated { - status, err = env.getTestPodStatus(test) + var err error + status, err = env.getTestPodStatus(t) if err != nil { resourceCleanExit = false - if streamErr := env.streamError(test.result.Info); streamErr != nil { + if streamErr := env.streamError(t.result.Info); streamErr != nil { return streamErr } } diff --git a/pkg/releasetesting/test_suite_test.go b/pkg/releasetesting/test_suite_test.go index a2f6eda3a..59f122953 100644 --- a/pkg/releasetesting/test_suite_test.go +++ b/pkg/releasetesting/test_suite_test.go @@ -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) - return core.PodSucceeded, nil + return v1.PodSucceeded, nil } type podFailedKubeClient struct {