Minor improvements to the integration test framework.

Signed-off-by: Thomas Hallgren <[email protected]>
telepresenceio · Nov 23, 2023 · ae1afe9 · ae1afe9
1 parent 7255412
commit ae1afe9
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 28 deletions.
diff --git a/integration_test/integration_test.go b/integration_test/integration_test.go
@@ -8,9 +8,9 @@ import (
 )
 
 func Test_Integration(t *testing.T) {
-	moduleRoot, err := filepath.Abs("..")
+	ossRoot, err := filepath.Abs(".")
 	if err != nil {
 		t.Fatalf("unable to get absolute path of .oss: %v", err)
 	}
-	itest.RunTests(itest.TestContext(t, moduleRoot, moduleRoot))
+	itest.RunTests(itest.TestContext(t, ossRoot, filepath.Dir(ossRoot)))
 }
diff --git a/integration_test/itest/cluster.go b/integration_test/itest/cluster.go
@@ -198,7 +198,7 @@ func (s *cluster) Initialize(ctx context.Context) context.Context {
 func (s *cluster) tearDown(ctx context.Context) {
 	s.ensureQuit(ctx)
 	if s.kubeConfig != "" {
-		ctx = WithWorkingDir(ctx, filepath.Join(GetOSSRoot(ctx), "integration_test"))
+		ctx = WithWorkingDir(ctx, GetOSSRoot(ctx))
 		_ = Run(ctx, "kubectl", "delete", "-f", filepath.Join("testdata", "k8s", "client_rbac.yaml"))
 		_ = Run(ctx, "kubectl", "delete", "--wait=false", "ns", "-l", "purpose=tp-cli-testing")
 	}
@@ -569,7 +569,7 @@ func (s *cluster) InstallTrafficManagerVersion(ctx context.Context, version stri
 func (s *cluster) installChart(ctx context.Context, release bool, chartFilename string, values map[string]string) error {
 	settings := s.self.GetValuesForHelm(ctx, values, release)
 
-	ctx = WithWorkingDir(ctx, filepath.Join(GetOSSRoot(ctx), "integration_test"))
+	ctx = WithWorkingDir(ctx, GetOSSRoot(ctx))
 	nss := GetNamespaces(ctx)
 	args := []string{"install", "-n", nss.Namespace, "--wait"}
 	args = append(args, settings...)

diff --git a/integration_test/itest/context.go b/integration_test/itest/context.go
@@ -76,11 +76,11 @@ func GetOSSRoot(ctx context.Context) string {
 	if dir, ok := ctx.Value(ossRootKey{}).(string); ok {
 		return dir
 	}
-	moduleRoot, err := os.Getwd()
+	ossRoot, err := os.Getwd()
 	if err != nil {
 		panic("failed to get current directory")
 	}
-	return filepath.Dir(moduleRoot)
+	return ossRoot
 }
 
 // SetOSSRoot sets the OSS module root for the given context to dir.

diff --git a/integration_test/itest/harness.go b/integration_test/itest/harness.go
@@ -54,18 +54,21 @@ func (h *harness) HarnessContext() context.Context {
 }
 
 func (h *harness) RunSuite(s TestingSuite) {
-	ctx := h.HarnessContext()
+	if suiteEnabled(h.HarnessContext(), s) {
+		h.HarnessT().Run(s.SuiteName(), func(t *testing.T) { suite.Run(t, s) })
+	}
+}
+
+func suiteEnabled(ctx context.Context, s TestingSuite) bool {
 	suiteRx := dos.Getenv(ctx, "TEST_SUITE")
-	if suiteRx != "" {
-		r, err := regexp.Compile(suiteRx)
-		if err != nil {
-			getT(ctx).Fatal(err)
-		}
-		if !r.MatchString(s.SuiteName()) {
-			return
-		}
+	if suiteRx == "" {
+		return true
+	}
+	r, err := regexp.Compile(suiteRx)
+	if err != nil {
+		getT(ctx).Fatal(err)
 	}
-	h.HarnessT().Run(s.SuiteName(), func(t *testing.T) { suite.Run(t, s) })
+	return r.MatchString(s.SuiteName())
 }
 
 // SetupSuite calls all functions that has been added with AddSetup in the order they

diff --git a/integration_test/itest/namespace.go b/integration_test/itest/namespace.go
@@ -117,7 +117,7 @@ func (s *nsPair) setup(ctx context.Context) bool {
 	if t.Failed() {
 		return false
 	}
-	err := Kubectl(ctx, s.Namespace, "apply", "-f", filepath.Join(GetOSSRoot(ctx), "integration_test", "testdata", "k8s", "client_sa.yaml"))
+	err := Kubectl(ctx, s.Namespace, "apply", "-f", filepath.Join(GetOSSRoot(ctx), "testdata", "k8s", "client_sa.yaml"))
 	assert.NoError(t, err, "failed to create connect ServiceAccount")
 	return !t.Failed()
 }

diff --git a/integration_test/itest/runner.go b/integration_test/itest/runner.go
@@ -144,9 +144,11 @@ func (r *runner) RunTests(c context.Context) { //nolint:gocognit
 				t := getT(c)
 				for _, f := range r.withCluster {
 					s := f(c)
-					t.Run(s.SuiteName(), func(t *testing.T) {
-						suite.Run(t, f(c))
-					})
+					if suiteEnabled(c, s) {
+						t.Run(s.SuiteName(), func(t *testing.T) {
+							suite.Run(t, f(c))
+						})
+					}
 				}
 			}()
 			for s, sr := range r.withSuffix {

diff --git a/integration_test/itest/status.go b/integration_test/itest/status.go
@@ -3,6 +3,7 @@ package itest
 import (
 	"context"
 	"encoding/json"
+	"errors"
 
 	"github.com/stretchr/testify/require"
 
@@ -13,18 +14,23 @@ import (
 type StatusResponse struct {
 	RootDaemon cmd.RootDaemonStatus `json:"root_daemon,omitempty"`
 	UserDaemon cmd.UserDaemonStatus `json:"user_daemon,omitempty"`
+	Error      string               `json:"err,omitempty"`
 }
 
 func TelepresenceStatus(ctx context.Context, args ...string) (*StatusResponse, error) {
 	stdout, stderr, err := Telepresence(ctx, append([]string{"status", "--output", "json"}, args...)...)
+	var status StatusResponse
+	jErr := json.Unmarshal([]byte(stdout), &status)
 	if err != nil {
+		if jErr == nil && status.Error != "" {
+			dlog.Error(ctx, status.Error)
+			return nil, errors.New(status.Error)
+		}
 		dlog.Error(ctx, stderr)
 		return nil, err
 	}
-	var status StatusResponse
-	err = json.Unmarshal([]byte(stdout), &status)
-	if err != nil {
-		return nil, err
+	if jErr != nil {
+		return nil, jErr
 	}
 	return &status, nil
 }

diff --git a/integration_test/multi_connect_test.go b/integration_test/multi_connect_test.go
@@ -63,7 +63,7 @@ func (s *multiConnectSuite) SetupSuite() {
 	}()
 
 	ctx2 := itest.WithNamespaces(ctx, &itest.Namespaces{Namespace: s.mgrSpace2, ManagedNamespaces: []string{s.appSpace2}})
-	err := itest.Kubectl(ctx2, s.mgrSpace2, "apply", "-f", filepath.Join(itest.GetOSSRoot(ctx2), "integration_test", "testdata", "k8s", "client_sa.yaml"))
+	err := itest.Kubectl(ctx2, s.mgrSpace2, "apply", "-f", filepath.Join(itest.GetOSSRoot(ctx2), "testdata", "k8s", "client_sa.yaml"))
 	require.NoError(err, "failed to create connect ServiceAccount")
 
 	ctx2 = itest.WithUser(ctx2, s.mgrSpace2+":"+itest.TestUser)

diff --git a/pkg/client/cli/cmd/status.go b/pkg/client/cli/cmd/status.go
@@ -56,10 +56,10 @@ type UserDaemonStatus struct {
 	Namespace         string                   `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 	ManagerNamespace  string                   `json:"manager_namespace,omitempty" yaml:"manager_namespace,omitempty"`
 	MappedNamespaces  []string                 `json:"mapped_namespaces,omitempty" yaml:"mapped_namespaces,omitempty"`
-	Intercepts        []connectStatusIntercept `json:"intercepts,omitempty" yaml:"intercepts,omitempty"`
+	Intercepts        []ConnectStatusIntercept `json:"intercepts,omitempty" yaml:"intercepts,omitempty"`
 }
 
-type connectStatusIntercept struct {
+type ConnectStatusIntercept struct {
 	Name   string `json:"name,omitempty" yaml:"name,omitempty"`
 	Client string `json:"client,omitempty" yaml:"client,omitempty"`
 }
@@ -176,7 +176,7 @@ func BasicGetStatusInfo(ctx context.Context) (ioutil.WriterTos, error) {
 		us.KubernetesServer = status.ClusterServer
 		us.KubernetesContext = status.ClusterContext
 		for _, icept := range status.GetIntercepts().GetIntercepts() {
-			us.Intercepts = append(us.Intercepts, connectStatusIntercept{
+			us.Intercepts = append(us.Intercepts, ConnectStatusIntercept{
 				Name:   icept.Spec.Name,
 				Client: icept.Spec.Client,
 			})