diff --git a/examples/nginx-deployment/test.nix b/examples/nginx-deployment/test.nix index 4ef38c3..62ce4a2 100644 --- a/examples/nginx-deployment/test.nix +++ b/examples/nginx-deployment/test.nix @@ -9,12 +9,12 @@ with lib; name = "nginx-deployment"; description = "Test testing nginx deployment"; testScript = '' - $kube->waitUntilSucceeds("docker load < ${config.docker.images.nginx.image}"); - $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); + kube.wait_until_succeeds("docker load < ${config.docker.images.nginx.image}") + kube.wait_until_succeeds("kubectl apply -f ${config.kubernetes.result}") - $kube->succeed("kubectl get deployment | grep -i nginx"); - $kube->waitUntilSucceeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10"); - $kube->waitUntilSucceeds("${pkgs.curl}/bin/curl http://nginx.default.svc.cluster.local | grep -i hello"); + kube.succeed("kubectl get deployment | grep -i nginx") + kube.wait_until_succeeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10") + kube.wait_until_succeeds({pkgs.curl}/bin/curl http://nginx.default.svc.cluster.local | grep -i hello") ''; }; } diff --git a/modules/testing.nix b/modules/testing.nix index 65a14c2..46b780a 100644 --- a/modules/testing.nix +++ b/modules/testing.nix @@ -100,10 +100,12 @@ let networking.primaryIPAddress = mkForce "192.168.1.1"; }; - testScript = '' - startAll; + skipLint = true; - $kube->waitUntilSucceeds("kubectl get node kube.my.xzy | grep -w Ready"); + testScript = '' + start_all() + + kube.wait_until_succeeds("kubectl get node kube.my.xzy | grep -w Ready") ${testScript} ''; diff --git a/tests/helm/simple.nix b/tests/helm/simple.nix index b8e27cc..89e53cf 100644 --- a/tests/helm/simple.nix +++ b/tests/helm/simple.nix @@ -50,11 +50,11 @@ in { appsv1.StatefulSet.app-psql-postgresql-master.metadata.namespace == "test"; }]; testScript = '' - $kube->waitUntilSucceeds("docker load < ${postgresql}"); - $kube->waitUntilSucceeds("docker load < ${postgresqlExporter}"); - $kube->waitUntilSucceeds("docker load < ${minideb}"); - $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); - $kube->waitUntilSucceeds("PGPASSWORD=postgres ${pkgs.postgresql}/bin/psql -h app-psql-postgresql.test.svc.cluster.local -U postgres -l"); + kube.wait_until_succeeds("docker load < ${postgresql}") + kube.wait_until_succeeds("docker load < ${postgresqlExporter}") + kube.wait_until_succeeds("docker load < ${minideb}") + kube.wait_until_succeeds("kubectl apply -f ${config.kubernetes.result}") + kube.wait_until_succeeds("PGPASSWORD=postgres ${pkgs.postgresql}/bin/psql -h app-psql-postgresql.test.svc.cluster.local -U postgres -l") ''; }; diff --git a/tests/k8s/crd.nix b/tests/k8s/crd.nix index f467483..a1cf54d 100644 --- a/tests/k8s/crd.nix +++ b/tests/k8s/crd.nix @@ -16,10 +16,10 @@ in { assertion = latestCrontab.apiVersion == "stable.example.com/v2"; }]; testScript = '' - $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); - $kube->succeed("kubectl get crds | grep -i crontabs"); - $kube->succeed("kubectl get crontabs | grep -i versioned"); - $kube->succeed("kubectl get crontabs | grep -i latest"); + kube.wait_until_succeeds("kubectl apply -f ${config.kubernetes.result}") + kube.succeed("kubectl get crds | grep -i crontabs") + kube.succeed("kubectl get crontabs | grep -i versioned") + kube.succeed("kubectl get crontabs | grep -i latest") ''; }; diff --git a/tests/k8s/deployment.nix b/tests/k8s/deployment.nix index d40c998..7e38a64 100644 --- a/tests/k8s/deployment.nix +++ b/tests/k8s/deployment.nix @@ -31,11 +31,11 @@ in { services.kubernetes.kubelet.seedDockerImages = config.docker.export; }; testScript = '' - $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); + kube.wait_until_succeeds("kubectl apply -f ${config.kubernetes.result}") - $kube->succeed("kubectl get deployment | grep -i nginx"); - $kube->waitUntilSucceeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10"); - $kube->waitUntilSucceeds("curl http://nginx.default.svc.cluster.local | grep -i hello"); + kube.succeed("kubectl get deployment | grep -i nginx") + kube.wait_until_succeeds("kubectl get deployment -o go-template nginx --template={{.status.readyReplicas}} | grep 10") + kube.wait_until_succeeds("curl http://nginx.default.svc.cluster.local | grep -i hello") ''; }; diff --git a/tests/module.nix b/tests/module.nix index 78070a8..2ed201c 100644 --- a/tests/module.nix +++ b/tests/module.nix @@ -22,11 +22,11 @@ in { assertion = (head config.docker.export) == images.nginx; }]; testScript = '' - $kube->waitUntilSucceeds("docker load < ${images.nginx}"); - $kube->waitUntilSucceeds("kubectl apply -f ${config.kubernetes.result}"); + kube.wait_until_succeeds("docker load < ${images.nginx}") + kube.wait_until_succeeds("kubectl apply -f ${config.kubernetes.result}") - $kube->succeed("kubectl get deployment -n test | grep -i test-nginx"); - $kube->waitUntilSucceeds("kubectl get deployment -n test -o go-template test-nginx --template={{.status.readyReplicas}} | grep 1"); + kube.succeed("kubectl get deployment -n test | grep -i test-nginx") + kube.wait_until_succeeds("kubectl get deployment -n test -o go-template test-nginx --template={{.status.readyReplicas}} | grep 1") ''; };