Skip to content

Commit 9c327e8

Browse files
committed
fixed bugs
Signed-off-by: kumarabd <abishekkumar92@gmail.com>
1 parent 50295b7 commit 9c327e8

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

smi-conformance/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/layer5io/learn-layer5/smi-conformance
22

33
go 1.13
44

5-
replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334
5+
replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f
66

77
require (
88
github.com/golang/protobuf v1.4.2

smi-conformance/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ github.com/kumarabd/gokit v0.2.0 h1:oK7utJ7OODFX+tAAQkDufMp4g/ooiJxYwNqaHf4ItUg=
287287
github.com/kumarabd/gokit v0.2.0/go.mod h1:PdII4jWKPVYICrdF/qU6B4GiRmV51uLVWH7npYnHBlo=
288288
github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334 h1:nPVyMtCMrSUI+YmYpXAJHOrI7fw00YxbeE1oFnx/Et4=
289289
github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE=
290+
github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f h1:L424py/DKSmjUDk+CAisjtS2kHaYEJhsC/6bc7CCnKI=
291+
github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE=
290292
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
291293
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
292294
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

smi-conformance/test-gen/test_gen.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ type Results struct {
3030
}
3131

3232
func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Results {
33-
manifestDirs := []string{}
34-
output := Results{}
35-
results := &report.Testsuites{}
3633

3734
c := make(chan Results)
3835
go func() {
@@ -60,7 +57,11 @@ func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Resu
6057
if options.KINDContext == "" {
6158
options.KINDContext = harness.DefaultKINDContext
6259
}
63-
60+
61+
serviceMeshConfObj := SMIConformance{
62+
SMObj: meshConfig,
63+
}
64+
6465
testHandlers := make(map[string]map[string]test.CustomTest)
6566
testHandlers["traffic-access"] = serviceMeshConfObj.TrafficAccessGetTests()
6667
testHandlers["traffic-spec"] = serviceMeshConfObj.TrafficSpecGetTests()
@@ -82,15 +83,6 @@ func RunTest(meshConfig ServiceMesh, annotations, labels map[string]string) Resu
8283
// Namespace Injection
8384
// annotations["linkerd.io/inject"] = "enabled"
8485

85-
serviceMeshConfObj := SMIConformance{
86-
SMObj: meshConfig,
87-
}
88-
89-
testHandlers := make(map[string]map[string]test.CustomTest)
90-
testHandlers["traffic-access"] = serviceMeshConfObj.TrafficAccessGetTests()
91-
testHandlers["traffic-spec"] = serviceMeshConfObj.TrafficSpecGetTests()
92-
testHandlers["traffic-split"] = serviceMeshConfObj.TrafficSplitGetTests()
93-
9486
// Runs the test using the inCluster kubeConfig (runs only when the code is running inside the pod)
9587
harness.InCluster = true
9688

0 commit comments

Comments
 (0)