From 256c30a4b92ef0f6ef27cb24ce61e7d74d7cfaf2 Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Wed, 28 Mar 2018 09:52:10 +0200 Subject: [PATCH] fixes required after merge --- tests/immutable_test.go | 2 +- tests/upgrade_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/immutable_test.go b/tests/immutable_test.go index ee95fce27..436fd2174 100644 --- a/tests/immutable_test.go +++ b/tests/immutable_test.go @@ -65,7 +65,7 @@ func TestImmutableFields(t *testing.T) { client := mustNewArangodDatabaseClient(ctx, kubecli, apiObject, t) // Wait for single server to be completely ready - if err := waitUntilVersionUp(client); err != nil { + if err := waitUntilVersionUp(client, nil); err != nil { t.Fatalf("Single server not up in time: %v", err) } diff --git a/tests/upgrade_test.go b/tests/upgrade_test.go index ab2fa5cb6..7e88f98c1 100644 --- a/tests/upgrade_test.go +++ b/tests/upgrade_test.go @@ -101,7 +101,7 @@ func upgradeSubTest(t *testing.T, mode api.DeploymentMode, engine api.StorageEng } // Wait for deployment to be ready - deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentHasState(api.DeploymentStateRunning)) + deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady()) if err != nil { t.Fatalf("Deployment not running in time: %v", err) } @@ -123,7 +123,7 @@ func upgradeSubTest(t *testing.T, mode api.DeploymentMode, engine api.StorageEng t.Fatalf("Failed to upgrade the Image from version : " + fromVersion + " to version: " + toVersion) } - deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentHasState(api.DeploymentStateRunning)) + deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady()) if err != nil { t.Fatalf("Deployment not running in time: %v", err) }