diff options
| author | wackxu <xushiwei5@huawei.com> | 2022-11-10 10:02:02 +0800 |
|---|---|---|
| committer | wackxu <xushiwei5@huawei.com> | 2023-01-14 17:42:48 +0800 |
| commit | 2d238d1e9abc76712a128abeff817eafc8550933 (patch) | |
| tree | b0a87df524e7d31c1e235dc541b235df983a6d2a /edge/test | |
| parent | Merge pull request #4282 from vincentgoat/localup (diff) | |
| download | kubeedge-2d238d1e9abc76712a128abeff817eafc8550933.tar.gz | |
revert ginkgo to v1
Signed-off-by: wackxu <xushiwei5@huawei.com>
Diffstat (limited to 'edge/test')
7 files changed, 10 insertions, 10 deletions
diff --git a/edge/test/integration/appdeployment/application_suite_test.go b/edge/test/integration/appdeployment/application_suite_test.go index c4a959434..dadd24a3c 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/v2" + . "github.com/onsi/ginkgo" . "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 2208cf89d..6b51020b4 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/v2" + . "github.com/onsi/ginkgo" . "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 1565c29ab..3e421cc44 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/v2" + . "github.com/onsi/ginkgo" . "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 14451b384..23b1bff56 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/v2" + . "github.com/onsi/ginkgo" . "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 a73ec3c14..e2998efbd 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/v2" + . "github.com/onsi/ginkgo" . "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 09fb2eb07..681537919 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/v2" + . "github.com/onsi/ginkgo" . "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 92c856858..18be56712 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/v2" + "github.com/onsi/ginkgo" ) //Function to get time in millisec @@ -49,11 +49,11 @@ func Infof(format string, args ...interface{}) { //Function to print the test case name and status of execution func PrintTestcaseNameandStatus() { var Status string - testSpecReport := ginkgo.CurrentSpecReport() - if testSpecReport.Failed() { + testSpecReport := ginkgo.CurrentGinkgoTestDescription() + if testSpecReport.Failed { Status = "FAILED" } else { Status = "PASSED" } - Infof("TestCase:%40s Status=%s", testSpecReport.LeafNodeText, Status) + Infof("TestCase:%40s Status=%s", testSpecReport.TestText, Status) } |