Skip to content

Various renamings in tests such that common names are used. #119

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

Merged
merged 3 commits into from
Apr 6, 2018
Merged

Various renamings in tests such that common names are used. #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d6a4bb
Various name changes to align with other tests
ewoutp Apr 6, 2018
aecfd60
Merge branch 'master' into various-test-fixes
ewoutp Apr 6, 2018
c3a7cfb
Minor fixes
ewoutp Apr 6, 2018
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
8 changes: 4 additions & 4 deletions tests/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {

// Secret must now exist
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
}

// Create a database client
Expand All @@ -59,7 +59,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {

// Secret must no longer exist
if err := waitUntilSecretNotFound(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, time.Minute); err != nil {
t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.JWTSecretName, err)
t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
}
}

Expand Down Expand Up @@ -181,7 +181,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {

// Secret must now exist
if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
}

// Create a database client
Expand All @@ -198,7 +198,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {

// Secret must no longer exist
if err := waitUntilSecretNotFound(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, time.Minute); err != nil {
t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.JWTSecretName, err)
t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
}
}

Expand Down
80 changes: 40 additions & 40 deletions tests/deployments_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,33 +70,33 @@ func deploymentSubTest(t *testing.T, mode api.DeploymentMode, engine api.Storage
// check environment
longOrSkip(t)

k8sNameSpace := getNamespace(t)
k8sClient := mustNewKubeClient(t)
deploymentClient := kubeArangoClient.MustNewInCluster()
ns := getNamespace(t)
kubecli := mustNewKubeClient(t)
c := kubeArangoClient.MustNewInCluster()

// Prepare deployment config
deploymentTemplate := newDeployment("test-1-deployment-" + string(mode) + "-" + string(engine) + "-" + uniuri.NewLen(4))
deploymentTemplate.Spec.Mode = api.NewMode(mode)
deploymentTemplate.Spec.StorageEngine = api.NewStorageEngine(engine)
deploymentTemplate.Spec.TLS = api.TLSSpec{} // should auto-generate cert
deploymentTemplate.Spec.SetDefaults(deploymentTemplate.GetName()) // this must be last
depl := newDeployment("test-deployment-" + string(mode) + "-" + string(engine) + "-" + uniuri.NewLen(4))
depl.Spec.Mode = api.NewMode(mode)
depl.Spec.StorageEngine = api.NewStorageEngine(engine)
depl.Spec.TLS = api.TLSSpec{} // should auto-generate cert
depl.Spec.SetDefaults(depl.GetName()) // this must be last

// Create deployment
_, err := deploymentClient.DatabaseV1alpha().ArangoDeployments(k8sNameSpace).Create(deploymentTemplate)
_, err := c.DatabaseV1alpha().ArangoDeployments(ns).Create(depl)
require.NoError(t, err, fmt.Sprintf("Create deployment failed: %v", err))
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace)
defer deferedCleanupDeployment(c, depl.GetName(), ns)

// Wait for deployment to be ready
deployment, err := waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady())
deployment, err := waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())
require.NoError(t, err, fmt.Sprintf("Deployment not running in time: %v", err))

// Create a database client
ctx := context.Background()
DBClient := mustNewArangodDatabaseClient(ctx, k8sClient, deployment, t)
require.NoError(t, waitUntilArangoDeploymentHealthy(deployment, DBClient, k8sClient, ""), fmt.Sprintf("Deployment not healthy in time: %v", err))
DBClient := mustNewArangodDatabaseClient(ctx, kubecli, deployment, t)
require.NoError(t, waitUntilArangoDeploymentHealthy(deployment, DBClient, kubecli, ""), fmt.Sprintf("Deployment not healthy in time: %v", err))

// Cleanup
removeDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace)
removeDeployment(c, depl.GetName(), ns)

return nil
}
Expand All @@ -105,47 +105,47 @@ func deploymentSubTest(t *testing.T, mode api.DeploymentMode, engine api.Storage
func TestMultiDeployment(t *testing.T) {
longOrSkip(t)

k8sNameSpace := getNamespace(t)
k8sClient := mustNewKubeClient(t)
deploymentClient := kubeArangoClient.MustNewInCluster()
ns := getNamespace(t)
kubecli := mustNewKubeClient(t)
c := kubeArangoClient.MustNewInCluster()

// Prepare deployment configurations
deploymentTemplate1 := newDeployment("test-multidep1-1-" + uniuri.NewLen(4))
deploymentTemplate1.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
deploymentTemplate1.Spec.StorageEngine = api.NewStorageEngine(api.StorageEngineRocksDB)
deploymentTemplate1.Spec.TLS = api.TLSSpec{} // should auto-generate cert
deploymentTemplate1.Spec.SetDefaults(deploymentTemplate1.GetName()) // this must be last

deploymentTemplate2 := newDeployment("test-multidep1-2-" + uniuri.NewLen(4))
deploymentTemplate2.Spec.Mode = api.NewMode(api.DeploymentModeSingle)
deploymentTemplate2.Spec.StorageEngine = api.NewStorageEngine(api.StorageEngineMMFiles)
deploymentTemplate2.Spec.TLS = api.TLSSpec{} // should auto-generate cert
deploymentTemplate2.Spec.SetDefaults(deploymentTemplate2.GetName()) // this must be last
depl1 := newDeployment("test-multidep-1-" + uniuri.NewLen(4))
depl1.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
depl1.Spec.StorageEngine = api.NewStorageEngine(api.StorageEngineRocksDB)
depl1.Spec.TLS = api.TLSSpec{} // should auto-generate cert
depl1.Spec.SetDefaults(depl1.GetName()) // this must be last

depl2 := newDeployment("test-multidep-2-" + uniuri.NewLen(4))
depl2.Spec.Mode = api.NewMode(api.DeploymentModeSingle)
depl2.Spec.StorageEngine = api.NewStorageEngine(api.StorageEngineMMFiles)
depl2.Spec.TLS = api.TLSSpec{} // should auto-generate cert
depl2.Spec.SetDefaults(depl2.GetName()) // this must be last

// Create deployments
_, err := deploymentClient.DatabaseV1alpha().ArangoDeployments(k8sNameSpace).Create(deploymentTemplate1)
_, err := c.DatabaseV1alpha().ArangoDeployments(ns).Create(depl1)
require.NoError(t, err, fmt.Sprintf("Deployment creation failed: %v", err))
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate1.GetName(), k8sNameSpace)
defer deferedCleanupDeployment(c, depl1.GetName(), ns)

_, err = deploymentClient.DatabaseV1alpha().ArangoDeployments(k8sNameSpace).Create(deploymentTemplate2)
_, err = c.DatabaseV1alpha().ArangoDeployments(ns).Create(depl2)
require.NoError(t, err, fmt.Sprintf("Deployment creation failed: %v", err))
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate2.GetName(), k8sNameSpace)
defer deferedCleanupDeployment(c, depl2.GetName(), ns)

// Wait for deployments to be ready
deployment1, err := waitUntilDeployment(deploymentClient, deploymentTemplate1.GetName(), k8sNameSpace, deploymentIsReady())
deployment1, err := waitUntilDeployment(c, depl1.GetName(), ns, deploymentIsReady())
require.NoError(t, err, fmt.Sprintf("Deployment not running in time: %v", err))

deployment2, err := waitUntilDeployment(deploymentClient, deploymentTemplate2.GetName(), k8sNameSpace, deploymentIsReady())
deployment2, err := waitUntilDeployment(c, depl2.GetName(), ns, deploymentIsReady())
require.NoError(t, err, fmt.Sprintf("Deployment not running in time: %v", err))

require.True(t, deployment1 != nil && deployment2 != nil, "deployment is nil")

// Create a database clients
ctx := context.Background()
DBClient1 := mustNewArangodDatabaseClient(ctx, k8sClient, deployment1, t)
require.NoError(t, waitUntilArangoDeploymentHealthy(deployment1, DBClient1, k8sClient, ""), fmt.Sprintf("Deployment not healthy in time: %v", err))
DBClient2 := mustNewArangodDatabaseClient(ctx, k8sClient, deployment2, t)
require.NoError(t, waitUntilArangoDeploymentHealthy(deployment1, DBClient1, k8sClient, ""), fmt.Sprintf("Deployment not healthy in time: %v", err))
DBClient1 := mustNewArangodDatabaseClient(ctx, kubecli, deployment1, t)
require.NoError(t, waitUntilArangoDeploymentHealthy(deployment1, DBClient1, kubecli, ""), fmt.Sprintf("Deployment not healthy in time: %v", err))
DBClient2 := mustNewArangodDatabaseClient(ctx, kubecli, deployment2, t)
require.NoError(t, waitUntilArangoDeploymentHealthy(deployment1, DBClient1, kubecli, ""), fmt.Sprintf("Deployment not healthy in time: %v", err))

// Test if we are able to create a collections in both deployments.
db1, err := DBClient1.Database(ctx, "_system")
Expand All @@ -171,8 +171,8 @@ func TestMultiDeployment(t *testing.T) {
assert.False(t, containsCollection(collections2, "col1"), "collection must not be in this deployment")

// Cleanup
removeDeployment(deploymentClient, deploymentTemplate1.GetName(), k8sNameSpace)
removeDeployment(deploymentClient, deploymentTemplate2.GetName(), k8sNameSpace)
removeDeployment(c, depl1.GetName(), ns)
removeDeployment(c, depl2.GetName(), ns)

}

Expand Down
40 changes: 20 additions & 20 deletions tests/environments_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,50 +36,50 @@ import (
"github.com/arangodb/kube-arangodb/pkg/util"
)

// Test if deployment comes up in production environment.
// TestEnvironmentProduction tests if deployment comes up in production environment.
// LONG: The test ensures that the deployment fails if there are
// less nodes available than servers required.
func TestProduction(t *testing.T) {
func TestEnvironmentProduction(t *testing.T) {
longOrSkip(t)

mode := api.DeploymentModeCluster
engine := api.StorageEngineRocksDB

k8sNameSpace := getNamespace(t)
k8sClient := mustNewKubeClient(t)
ns := getNamespace(t)
kubecli := mustNewKubeClient(t)

nodeList, err := k8sClient.CoreV1().Nodes().List(metav1.ListOptions{})
nodeList, err := kubecli.CoreV1().Nodes().List(metav1.ListOptions{})
if err != nil {
t.Fatalf("Unable to receive node list: %v", err)
}
numNodes := len(nodeList.Items)

deploymentClient := kubeArangoClient.MustNewInCluster()
deploymentTemplate := newDeployment(strings.Replace(fmt.Sprintf("tprod-%s-%s-%s", mode[:2], engine[:2], uniuri.NewLen(4)), ".", "", -1))
deploymentTemplate.Spec.Mode = api.NewMode(mode)
deploymentTemplate.Spec.StorageEngine = api.NewStorageEngine(engine)
deploymentTemplate.Spec.TLS = api.TLSSpec{}
deploymentTemplate.Spec.Environment = api.NewEnvironment(api.EnvironmentProduction)
deploymentTemplate.Spec.Image = util.NewString("arangodb/arangodb:3.3.4")
deploymentTemplate.Spec.DBServers.Count = util.NewInt(numNodes + 1)
deploymentTemplate.Spec.SetDefaults(deploymentTemplate.GetName()) // this must be last
assert.NoError(t, deploymentTemplate.Spec.Validate())
c := kubeArangoClient.MustNewInCluster()
depl := newDeployment(strings.Replace(fmt.Sprintf("tprod-%s-%s-%s", mode[:2], engine[:2], uniuri.NewLen(4)), ".", "", -1))
depl.Spec.Mode = api.NewMode(mode)
depl.Spec.StorageEngine = api.NewStorageEngine(engine)
depl.Spec.TLS = api.TLSSpec{}
depl.Spec.Environment = api.NewEnvironment(api.EnvironmentProduction)
depl.Spec.Image = util.NewString("arangodb/arangodb:3.3.4")
depl.Spec.DBServers.Count = util.NewInt(numNodes + 1)
depl.Spec.SetDefaults(depl.GetName()) // this must be last
assert.NoError(t, depl.Spec.Validate())

dbserverCount := deploymentTemplate.Spec.DBServers.GetCount()
dbserverCount := depl.Spec.DBServers.GetCount()
if dbserverCount < 3 {
t.Skipf("Not enough DBServers to run this test: server count %d", dbserverCount)
}

// Create deployment
if _, err := deploymentClient.DatabaseV1alpha().ArangoDeployments(k8sNameSpace).Create(deploymentTemplate); err != nil {
if _, err := c.DatabaseV1alpha().ArangoDeployments(ns).Create(depl); err != nil {
// REVIEW - should the test already fail here
t.Fatalf("Create deployment failed: %v", err)
}
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace)
defer deferedCleanupDeployment(c, depl.GetName(), ns)

_, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady())
_, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())
assert.Error(t, err, fmt.Sprintf("Deployment is up and running when it should not! There are not enough nodes(%d) for all DBServers(%d) in production modes.", numNodes, dbserverCount))

// Cleanup
removeDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace)
removeDeployment(c, depl.GetName(), ns)
}
36 changes: 18 additions & 18 deletions tests/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,58 +83,58 @@ func upgradeSubTest(t *testing.T, mode api.DeploymentMode, engine api.StorageEng
// check environment
longOrSkip(t)

k8sNameSpace := getNamespace(t)
k8sClient := mustNewKubeClient(t)
deploymentClient := kubeArangoClient.MustNewInCluster()
ns := getNamespace(t)
kubecli := mustNewKubeClient(t)
c := kubeArangoClient.MustNewInCluster()

deploymentTemplate := newDeployment(strings.Replace(fmt.Sprintf("tu-%s-%s-%st%s-%s", mode[:2], engine[:2], fromVersion, toVersion, uniuri.NewLen(4)), ".", "", -1))
deploymentTemplate.Spec.Mode = api.NewMode(mode)
deploymentTemplate.Spec.StorageEngine = api.NewStorageEngine(engine)
deploymentTemplate.Spec.TLS = api.TLSSpec{} // should auto-generate cert
deploymentTemplate.Spec.Image = util.NewString("arangodb/arangodb:" + fromVersion)
deploymentTemplate.Spec.SetDefaults(deploymentTemplate.GetName()) // this must be last
depl := newDeployment(strings.Replace(fmt.Sprintf("tu-%s-%s-%st%s-%s", mode[:2], engine[:2], fromVersion, toVersion, uniuri.NewLen(4)), ".", "", -1))
depl.Spec.Mode = api.NewMode(mode)
depl.Spec.StorageEngine = api.NewStorageEngine(engine)
depl.Spec.TLS = api.TLSSpec{} // should auto-generate cert
depl.Spec.Image = util.NewString("arangodb/arangodb:" + fromVersion)
depl.Spec.SetDefaults(depl.GetName()) // this must be last

// Create deployment
deployment, err := deploymentClient.DatabaseV1alpha().ArangoDeployments(k8sNameSpace).Create(deploymentTemplate)
deployment, err := c.DatabaseV1alpha().ArangoDeployments(ns).Create(depl)
if err != nil {
t.Fatalf("Create deployment failed: %v", err)
}
defer deferedCleanupDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace)
defer deferedCleanupDeployment(c, depl.GetName(), ns)

// Wait for deployment to be ready
deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady())
deployment, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())
if err != nil {
t.Fatalf("Deployment not running in time: %v", err)
}

// Create a database client
ctx := context.Background()
DBClient := mustNewArangodDatabaseClient(ctx, k8sClient, deployment, t)
DBClient := mustNewArangodDatabaseClient(ctx, kubecli, deployment, t)

if err := waitUntilArangoDeploymentHealthy(deployment, DBClient, k8sClient, ""); err != nil {
if err := waitUntilArangoDeploymentHealthy(deployment, DBClient, kubecli, ""); err != nil {
t.Fatalf("Deployment not healthy in time: %v", err)
}

// Try to change image version
deployment, err = updateDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace,
deployment, err = updateDeployment(c, depl.GetName(), ns,
func(spec *api.DeploymentSpec) {
spec.Image = util.NewString("arangodb/arangodb:" + toVersion)
})
if err != nil {
t.Fatalf("Failed to upgrade the Image from version : " + fromVersion + " to version: " + toVersion)
}

deployment, err = waitUntilDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace, deploymentIsReady())
deployment, err = waitUntilDeployment(c, depl.GetName(), ns, deploymentIsReady())
if err != nil {
t.Fatalf("Deployment not running in time: %v", err)
}

if err := waitUntilArangoDeploymentHealthy(deployment, DBClient, k8sClient, toVersion); err != nil {
if err := waitUntilArangoDeploymentHealthy(deployment, DBClient, kubecli, toVersion); err != nil {
t.Fatalf("Deployment not healthy in time: %v", err)
}

// Cleanup
removeDeployment(deploymentClient, deploymentTemplate.GetName(), k8sNameSpace)
removeDeployment(c, depl.GetName(), ns)

return nil
}