Skip to content

Commit 1459adf

Browse files
authored
Merge pull request #561 from jetstack/leftover-envtest
Leftover processes after running `make test`
2 parents 59bc5b8 + bffc7a1 commit 1459adf

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

pkg/client/client_venconn_test.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"io"
77
"net/http"
88
"net/http/httptest"
9+
"os"
910
"strings"
1011
"testing"
1112

@@ -334,18 +335,25 @@ func fakeTPP(t testing.TB) (*httptest.Server, *x509.Certificate) {
334335
//
335336
// export KUBEBUILDER_ATTACH_CONTROL_PLANE_OUTPUT=true
336337
func startEnvtest(t testing.TB) (_ *envtest.Environment, _ *rest.Config, kclient ctrlruntime.WithWatch) {
338+
// If KUBEBUILDER_ASSETS isn't set, show a warning to the user.
339+
if os.Getenv("KUBEBUILDER_ASSETS") == "" {
340+
t.Fatalf("KUBEBUILDER_ASSETS isn't set. You can run this test using `make test`.\n" +
341+
"But if you prefer not to use `make`, run these two commands first:\n" +
342+
" make _bin/tools/{kube-apiserver,etcd}\n" +
343+
" export KUBEBUILDER_ASSETS=$PWD/_bin/tools")
344+
}
337345
envtest := &envtest.Environment{
338346
ErrorIfCRDPathMissing: true,
339347
CRDDirectoryPaths: []string{"../../deploy/charts/venafi-kubernetes-agent/crd_bases/jetstack.io_venaficonnections.yaml"},
340348
}
341-
restconf, err := envtest.Start()
342-
require.NoError(t, err)
343349

350+
restconf, err := envtest.Start()
344351
t.Cleanup(func() {
345352
t.Log("Waiting for envtest to exit")
346-
err = envtest.Stop()
347-
require.NoError(t, err)
353+
e := envtest.Stop()
354+
require.NoError(t, e)
348355
})
356+
require.NoError(t, err)
349357

350358
sch := runtime.NewScheme()
351359
_ = v1alpha1.AddToScheme(sch)

0 commit comments

Comments
 (0)