Remove testlib.go (it was moved to lib/)

nephio-project · Apr 28, 2023 · 0554e7d · 0554e7d
1 parent 3c5b3c7
commit 0554e7d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 207 deletions.
diff --git a/krm-functions/dnn-fn/go.mod b/krm-functions/dnn-fn/go.mod
@@ -2,17 +2,14 @@ module github.com/nephio-project/nephio/krm-functions/dnn-fn
 
 go 1.20
 
-// replace github.com/nephio-project/nephio => ../..
-
 require (
 	github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20230302070146-e8e9cb3c3ae2
 	github.com/nephio-project/api v0.0.0-20230421174414-507255314347
-	github.com/nephio-project/nephio v0.0.0-20230427093420-b7f6197aeeaf
+	github.com/nephio-project/nephio v0.0.0-20230428140221-ab9543e76c00
 	github.com/nephio-project/nephio-controller-poc v0.0.2
 	github.com/nokia/k8s-ipam v0.0.4-0.20230416191338-dcd944a8d636
 	k8s.io/api v0.27.1
 	k8s.io/apimachinery v0.27.1
-	sigs.k8s.io/yaml v1.3.0
 )
 
 require (
@@ -66,4 +63,5 @@ require (
 	sigs.k8s.io/kustomize/api v0.12.1 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
diff --git a/krm-functions/dnn-fn/go.sum b/krm-functions/dnn-fn/go.sum
@@ -122,8 +122,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nephio-project/api v0.0.0-20230421174414-507255314347 h1:MiQmYHqGzvGOwf9+6KOEHDOoJ9m8W9bnxQQL9UcaJrc=
 github.com/nephio-project/api v0.0.0-20230421174414-507255314347/go.mod h1:ti2CdEDwuN+6l0pypPq0vwibZZKap0sEjJlMNLgcaHM=
-github.com/nephio-project/nephio v0.0.0-20230427093420-b7f6197aeeaf h1:YNn093Zx7Ip+goxxKeQrrsyHaxWUDqMPjxFv/3gXaTA=
-github.com/nephio-project/nephio v0.0.0-20230427093420-b7f6197aeeaf/go.mod h1:gQjfxi+3XmAK9vTx1xkoSh5v0y4tmID0jzTvEyuEMPs=
+github.com/nephio-project/nephio v0.0.0-20230428140221-ab9543e76c00 h1:Fa/SuRS9BxFEFsXm9qiHZ8tdzeTaqh95YuGdoR2yTRI=
+github.com/nephio-project/nephio v0.0.0-20230428140221-ab9543e76c00/go.mod h1:X8oI1HVkI3SI3A8wk5eWb1Tgj8Fu8ieraGfY9gSU4jE=
 github.com/nephio-project/nephio-controller-poc v0.0.2 h1:0iSooKeWzqmcTiLLfAzA4oWTWNzvOc7qcfVN+ctYexI=
 github.com/nephio-project/nephio-controller-poc v0.0.2/go.mod h1:oE13Jb5gopskPCv0YERhXwqxWIbp6uVsma/uxuP/jKc=
 github.com/nokia/k8s-ipam v0.0.4-0.20230416191338-dcd944a8d636 h1:D2wTzwXxdXwEf5F6edQrUdSujPiHAcxA3vD7WL4MnmM=

diff --git a/krm-functions/dnn-fn/golden_test.go b/krm-functions/dnn-fn/golden_test.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/GoogleContainerTools/kpt-functions-sdk/go/fn"
 	"github.com/GoogleContainerTools/kpt-functions-sdk/go/fn/testhelpers"
+	tst "github.com/nephio-project/nephio/krm-functions/lib/test"
 )
 
 const GoldenTestDataPath = "testdata/golden"
@@ -37,5 +38,5 @@ func TestGolden(t *testing.T) {
 func TestFailureCases(t *testing.T) {
 	fnRunner := fn.ResourceListProcessorFunc(Run)
 
-	RunFailureCases(t, FailureCaseDataPath, fnRunner)
+	tst.RunFailureCases(t, FailureCaseDataPath, fnRunner)
 }
diff --git a/krm-functions/dnn-fn/testlib.go b/krm-functions/dnn-fn/testlib.go