diff options
| author | Congrool <chpzhangyifei@zju.edu.cn> | 2022-06-30 18:38:44 +0800 |
|---|---|---|
| committer | Congrool <chpzhangyifei@zju.edu.cn> | 2022-07-12 19:12:43 +0800 |
| commit | 35f946cdb2b6d00bb600a75ed9fdaec2d4c2c008 (patch) | |
| tree | ad8d01de8bbae9803c61952b1d99ad337beea6e2 /edge/test | |
| parent | Merge pull request #4043 from fisherxu/rn-1.9.4 (diff) | |
| download | kubeedge-35f946cdb2b6d00bb600a75ed9fdaec2d4c2c008.tar.gz | |
bump ginkgo to v2
Signed-off-by: Congrool <chpzhangyifei@zju.edu.cn>
Diffstat (limited to 'edge/test')
7 files changed, 10 insertions, 11 deletions
diff --git a/edge/test/integration/appdeployment/application_suite_test.go b/edge/test/integration/appdeployment/application_suite_test.go index dadd24a3c..c4a959434 100644 --- a/edge/test/integration/appdeployment/application_suite_test.go +++ b/edge/test/integration/appdeployment/application_suite_test.go @@ -19,7 +19,7 @@ package application_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/kubeedge/kubeedge/edge/test/integration/utils" diff --git a/edge/test/integration/appdeployment/application_test.go b/edge/test/integration/appdeployment/application_test.go index 6b51020b4..2208cf89d 100644 --- a/edge/test/integration/appdeployment/application_test.go +++ b/edge/test/integration/appdeployment/application_test.go @@ -20,7 +20,7 @@ import ( "net/http" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/edge/test/integration/device/device_suite_test.go b/edge/test/integration/device/device_suite_test.go index 69598d3e6..45dc48897 100644 --- a/edge/test/integration/device/device_suite_test.go +++ b/edge/test/integration/device/device_suite_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/kubeedge/kubeedge/edge/pkg/devicetwin/dtcommon" diff --git a/edge/test/integration/device/device_test.go b/edge/test/integration/device/device_test.go index 23b1bff56..14451b384 100755 --- a/edge/test/integration/device/device_test.go +++ b/edge/test/integration/device/device_test.go @@ -23,7 +23,7 @@ import ( MQTT "github.com/eclipse/paho.mqtt.golang" _ "github.com/mattn/go-sqlite3" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/kubeedge/kubeedge/edge/pkg/devicetwin/dtcommon" diff --git a/edge/test/integration/metaserver/metaserver_suite_test.go b/edge/test/integration/metaserver/metaserver_suite_test.go index 485aa09d7..f1adc8a51 100644 --- a/edge/test/integration/metaserver/metaserver_suite_test.go +++ b/edge/test/integration/metaserver/metaserver_suite_test.go @@ -3,7 +3,7 @@ package metaserver_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/kubeedge/kubeedge/edge/test/integration/utils" diff --git a/edge/test/integration/metaserver/metaserver_test.go b/edge/test/integration/metaserver/metaserver_test.go index 681537919..09fb2eb07 100644 --- a/edge/test/integration/metaserver/metaserver_test.go +++ b/edge/test/integration/metaserver/metaserver_test.go @@ -3,7 +3,7 @@ package metaserver import ( "net/http" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/edge/test/integration/utils/common/log.go b/edge/test/integration/utils/common/log.go index d1267c07f..92c856858 100755 --- a/edge/test/integration/utils/common/log.go +++ b/edge/test/integration/utils/common/log.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/onsi/ginkgo" + "github.com/onsi/ginkgo/v2" ) //Function to get time in millisec @@ -48,13 +48,12 @@ func Infof(format string, args ...interface{}) { //Function to print the test case name and status of execution func PrintTestcaseNameandStatus() { - var testdesc ginkgo.GinkgoTestDescription var Status string - testdesc = ginkgo.CurrentGinkgoTestDescription() - if testdesc.Failed { + testSpecReport := ginkgo.CurrentSpecReport() + if testSpecReport.Failed() { Status = "FAILED" } else { Status = "PASSED" } - Infof("TestCase:%40s Status=%s", testdesc.TestText, Status) + Infof("TestCase:%40s Status=%s", testSpecReport.LeafNodeText, Status) } |