From f7161d9064e1e0cd57625625b114764dcc6c9c71 Mon Sep 17 00:00:00 2001 From: shawnh2 Date: Wed, 21 Feb 2024 22:28:40 +0800 Subject: [PATCH] address comments Signed-off-by: shawnh2 --- test/e2e/tests/merge-gateways.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/test/e2e/tests/merge-gateways.go b/test/e2e/tests/merge-gateways.go index 971872d5bfb..5e8659bb5dd 100644 --- a/test/e2e/tests/merge-gateways.go +++ b/test/e2e/tests/merge-gateways.go @@ -54,16 +54,12 @@ var MergeGatewaysTest = suite.ConformanceTest{ gw3Addr, _, err := net.SplitHostPort(gw3HostPort) if err != nil { - t.Errorf("failed to split hostport %s of gateway %s: %v", gw2HostPort, gw2NN.Name, err) - } - - if gw1Addr != gw2Addr { - t.Errorf("inconsistent gateway address %s and %s for %s and %s", gw1Addr, gw2Addr, gw1NN.String(), gw2NN.String()) - t.FailNow() + t.Errorf("failed to split hostport %s of gateway %s: %v", gw3HostPort, gw3NN.Name, err) } - if gw2Addr != gw3Addr { - t.Errorf("inconsistent gateway address %s and %s for %s and %s", gw2Addr, gw3Addr, gw2NN.String(), gw3NN.String()) + if gw1Addr != gw2Addr || gw2Addr != gw3Addr { + t.Errorf("inconsistent gateway address %s: %s, %s: %s and %s: %s", + gw1NN.String(), gw1Addr, gw2NN.String(), gw2Addr, gw3NN.String(), gw3Addr) t.FailNow() }