fixed bugs

Signed-off-by: kumarabd <[email protected]>
layer5io · Aug 9, 2020 · 9c327e8 · 9c327e8
1 parent 50295b7
commit 9c327e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/smi-conformance/go.mod b/smi-conformance/go.mod
@@ -2,7 +2,7 @@ module github.com/layer5io/learn-layer5/smi-conformance
 
 go 1.13
 
-replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334
+replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f
 
 require (
 	github.com/golang/protobuf v1.4.2

diff --git a/smi-conformance/go.sum b/smi-conformance/go.sum
@@ -287,6 +287,8 @@ github.com/kumarabd/gokit v0.2.0 h1:oK7utJ7OODFX+tAAQkDufMp4g/ooiJxYwNqaHf4ItUg=
 github.com/kumarabd/gokit v0.2.0/go.mod h1:PdII4jWKPVYICrdF/qU6B4GiRmV51uLVWH7npYnHBlo=
 github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334 h1:nPVyMtCMrSUI+YmYpXAJHOrI7fw00YxbeE1oFnx/Et4=
 github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE=
+github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f h1:L424py/DKSmjUDk+CAisjtS2kHaYEJhsC/6bc7CCnKI=
+github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

diff --git a/smi-conformance/test-gen/test_gen.go b/smi-conformance/test-gen/test_gen.go
@@ -30,9 +30,6 @@ type Results struct {
 }
 
 func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Results {
-	manifestDirs := []string{}
-	output := Results{}
-	results := &report.Testsuites{}
 
 	c := make(chan Results)
 	go func() {
@@ -60,7 +57,11 @@ func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Resu
 		if options.KINDContext == "" {
 			options.KINDContext = harness.DefaultKINDContext
 		}
-
+
+		serviceMeshConfObj := SMIConformance{
+			SMObj: meshConfig,
+		}
+
 		testHandlers := make(map[string]map[string]test.CustomTest)
 		testHandlers["traffic-access"] = serviceMeshConfObj.TrafficAccessGetTests()
 		testHandlers["traffic-spec"] = serviceMeshConfObj.TrafficSpecGetTests()
@@ -82,15 +83,6 @@ func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Resu
 			// Namespace Injection
 			// annotations["linkerd.io/inject"] = "enabled"
 
-			serviceMeshConfObj := SMIConformance{
-				SMObj: meshConfig,
-			}
-
-			testHandlers := make(map[string]map[string]test.CustomTest)
-			testHandlers["traffic-access"] = serviceMeshConfObj.TrafficAccessGetTests()
-			testHandlers["traffic-spec"] = serviceMeshConfObj.TrafficSpecGetTests()
-			testHandlers["traffic-split"] = serviceMeshConfObj.TrafficSplitGetTests()
-
 			// Runs the test using the inCluster kubeConfig (runs only when the code is running inside the pod)
 			harness.InCluster = true