Merge pull request #336 from TomChv/fix-skip-kub-test

Fix kubernetes skip condition
This commit is contained in:
Andrea Luzzardi 2021-04-19 12:29:17 -07:00 committed by GitHub
commit e6d96ef5c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 12 deletions

View File

@ -3,18 +3,13 @@
## TL;DR ## TL;DR
``` ```
# Get help # Install dependancies
./test.sh --help yarn --cwd install
# Run all tests # Run all tests
# You can also just call ./test.sh with no argument yarn --cwd test
# Also, `make integration` does exactly that
./test.sh all
# Run one random dagger cue directory, with expectations on exit code, stdout, stderr
./test.sh fetch-git/nonexistent/ref --exit=1 --stdout=
``` ```
By default, the dagger binary is expected to be found in ../../cmd/dagger/dagger relative to the test.sh script. By default, the `dagger` binary is expected to be found in `../cmd/dagger/dagger` relative to the `tests` directory.
If you need to change this, pass along `DAGGER_BINARY=somewhere/dagger` If you need to change this, pass along `DAGGER_BINARY=somewhere/dagger`

View File

@ -20,7 +20,7 @@ skip_unless_secrets_available() {
} }
skip_unless_local_kube() { skip_unless_local_kube() {
if [ -f ~/.kube/config ] && grep -q "kind" ~/.kube/config &> /dev/null; then if [ -f ~/.kube/config ] && grep -q "user: kind-kind" ~/.kube/config &> /dev/null && grep -q "127.0.0.1" ~/.kube/config &> /dev/null; then
echo "Kubernetes available" echo "Kubernetes available"
else else
skip "local kubernetes cluster not available" skip "local kubernetes cluster not available"

View File

@ -27,14 +27,12 @@ setup() {
} }
@test "stdlib: kubernetes" { @test "stdlib: kubernetes" {
skip "disabled"
skip_unless_local_kube skip_unless_local_kube
"$DAGGER" compute "$TESTDIR"/stdlib/kubernetes --input-dir kubeconfig=~/.kube "$DAGGER" compute "$TESTDIR"/stdlib/kubernetes --input-dir kubeconfig=~/.kube
} }
@test "stdlib: helm" { @test "stdlib: helm" {
skip "disabled"
skip_unless_local_kube skip_unless_local_kube
"$DAGGER" compute "$TESTDIR"/stdlib/kubernetes/helm --input-dir kubeconfig=~/.kube --input-dir TestHelmSimpleChart.deploy.chartSource="$TESTDIR"/stdlib/kubernetes/helm/testdata/mychart "$DAGGER" compute "$TESTDIR"/stdlib/kubernetes/helm --input-dir kubeconfig=~/.kube --input-dir TestHelmSimpleChart.deploy.chartSource="$TESTDIR"/stdlib/kubernetes/helm/testdata/mychart