Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use shipyard framework By instead of ginkgo By #1613

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Use shipyard framework By instead of ginkgo By #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
def50e7
Use shipyard framework By instead of ginkgo By
tpantelis Apr 3, 2024
4cf74b0
Modify framework logging functions to use the By and Fail hooks
tpantelis Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions test/e2e/framework/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"fmt"
"time"

"github.com/onsi/ginkgo/v2"
"github.com/submariner-io/shipyard/test/e2e/framework/ginkgowrapper"
)

Expand All @@ -31,7 +30,7 @@ func nowStamp() string {
}

func log(level, format string, args ...interface{}) {
fmt.Fprintf(ginkgo.GinkgoWriter, nowStamp()+": "+level+": "+format+"\n", args...)
By(fmt.Sprintf(nowStamp()+": "+level+": "+format+"\n", args...))
}

func Errorf(format string, args ...interface{}) {
Expand All @@ -49,9 +48,7 @@ func Failf(format string, args ...interface{}) {
// FailfWithOffset calls "Fail" and logs the error at "offset" levels above its caller
// (for example, for call chain f -> g -> FailfWithOffset(1, ...) error would be logged for "f").
func FailfWithOffset(offset int, format string, args ...interface{}) {
msg := fmt.Sprintf(format, args...)
log("INFO", msg)
ginkgowrapper.Fail(nowStamp()+": "+msg, 1+offset)
Fail(nowStamp()+": "+fmt.Sprintf(format, args...), 1+offset)
}

func Skipf(format string, args ...interface{}) {
Expand Down
19 changes: 9 additions & 10 deletions test/e2e/tcp/connectivity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ package tcp
import (
"fmt"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/submariner-io/shipyard/test/e2e/framework"
v1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -64,12 +63,12 @@ func RunConnectivityTest(p ConnectivityTestParams) (*framework.NetworkPod, *fram
listenerPod.CheckSuccessfulFinish()
connectorPod.CheckSuccessfulFinish()

By("Verifying that the listener got the connector's data and the connector got the listener's data")
framework.By("Verifying that the listener got the connector's data and the connector got the listener's data")
Expect(listenerPod.TerminationMessage).To(ContainSubstring(connectorPod.Config.Data))
Expect(connectorPod.TerminationMessage).To(ContainSubstring(listenerPod.Config.Data))

if p.Networking == framework.PodNetworking {
By("Verifying the output of listener pod which must contain the source IP")
framework.By("Verifying the output of listener pod which must contain the source IP")
Expect(listenerPod.TerminationMessage).To(ContainSubstring(connectorPod.Pod.Status.PodIP))
}

Expand All @@ -88,11 +87,11 @@ func RunNoConnectivityTest(p ConnectivityTestParams) (*framework.NetworkPod, *fr

listenerPod, connectorPod := createPods(&p)

By("Verifying that listener pod exits with non-zero code and timed out message")
framework.By("Verifying that listener pod exits with non-zero code and timed out message")
Expect(listenerPod.TerminationMessage).To(ContainSubstring("nc: timeout"))
Expect(listenerPod.TerminationCode).To(Equal(int32(1)))

By("Verifying that connector pod exists with zero code but times out")
framework.By("Verifying that connector pod exists with zero code but times out")
Expect(connectorPod.TerminationMessage).To(ContainSubstring("Connection timed out"))
Expect(connectorPod.TerminationCode).To(Equal(int32(0)))

Expand All @@ -101,7 +100,7 @@ func RunNoConnectivityTest(p ConnectivityTestParams) (*framework.NetworkPod, *fr
}

func createPods(p *ConnectivityTestParams) (*framework.NetworkPod, *framework.NetworkPod) {
By(fmt.Sprintf("Creating a listener pod in cluster %q, which will wait for a handshake over TCP",
framework.By(fmt.Sprintf("Creating a listener pod in cluster %q, which will wait for a handshake over TCP",
framework.TestContext.ClusterIDs[p.ToCluster]))

listenerPod := p.Framework.NewNetworkPod(&framework.NetworkPodConfig{
Expand All @@ -116,7 +115,7 @@ func createPods(p *ConnectivityTestParams) (*framework.NetworkPod, *framework.Ne
var service *v1.Service

if p.ToEndpointType == ServiceIP {
By(fmt.Sprintf("Pointing a service ClusterIP to the listener pod in cluster %q",
framework.By(fmt.Sprintf("Pointing a service ClusterIP to the listener pod in cluster %q",
framework.TestContext.ClusterIDs[p.ToCluster]))

service = listenerPod.CreateService()
Expand All @@ -125,7 +124,7 @@ func createPods(p *ConnectivityTestParams) (*framework.NetworkPod, *framework.Ne

framework.Logf("Will send traffic to IP: %v", remoteIP)

By(fmt.Sprintf("Creating a connector pod in cluster %q, which will attempt the specific UUID handshake over TCP",
framework.By(fmt.Sprintf("Creating a connector pod in cluster %q, which will attempt the specific UUID handshake over TCP",
framework.TestContext.ClusterIDs[p.FromCluster]))

connectorPod := p.Framework.NewNetworkPod(&framework.NetworkPodConfig{
Expand All @@ -138,10 +137,10 @@ func createPods(p *ConnectivityTestParams) (*framework.NetworkPod, *framework.Ne
Networking: p.Networking,
})

By(fmt.Sprintf("Waiting for the connector pod %q to exit, returning what connector sent", connectorPod.Pod.Name))
framework.By(fmt.Sprintf("Waiting for the connector pod %q to exit, returning what connector sent", connectorPod.Pod.Name))
connectorPod.AwaitFinish()

By(fmt.Sprintf("Waiting for the listener pod %q to exit, returning what listener sent", listenerPod.Pod.Name))
framework.By(fmt.Sprintf("Waiting for the listener pod %q to exit, returning what listener sent", listenerPod.Pod.Name))
listenerPod.AwaitFinish()

framework.Logf("Connector pod has IP: %s", connectorPod.Pod.Status.PodIP)
Expand Down
Loading