Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes required after merge #84

Merged
merged 1 commit into from
Mar 28, 2018
Merged

fixes required after merge #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/immutable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
4 changes: 2 additions & 2 deletions tests/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down