From 61555be7a0b00758d7ee0dd9389a6cd3d508d4a4 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Thu, 11 Nov 2021 08:42:00 -0700 Subject: [PATCH] internal/dag: fix tests from #4169 Fixes some logical merge conflicts in the tests from #4169. Signed-off-by: Steve Kriss --- internal/dag/builder_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/dag/builder_test.go b/internal/dag/builder_test.go index c253049950a..8a29244f0a4 100644 --- a/internal/dag/builder_test.go +++ b/internal/dag/builder_test.go @@ -10764,12 +10764,12 @@ func TestDAGInsert(t *testing.T) { }, want: listeners( &Listener{ + Name: HTTPS_LISTENER_NAME, Port: 443, SecureVirtualHosts: securevirtualhosts( &SecureVirtualHost{ VirtualHost: VirtualHost{ - Name: "example.com", - ListenerName: "ingress_https", + Name: "example.com", }, TCPProxy: &TCPProxy{ Clusters: clusters(service(s1), service(s2), service(s9)), @@ -10806,12 +10806,12 @@ func TestDAGInsert(t *testing.T) { }, want: listeners( &Listener{ + Name: HTTPS_LISTENER_NAME, Port: 443, SecureVirtualHosts: securevirtualhosts( &SecureVirtualHost{ VirtualHost: VirtualHost{ - Name: "example.com", - ListenerName: "ingress_https", + Name: "example.com", }, TCPProxy: &TCPProxy{ Clusters: []*Cluster{ @@ -10852,12 +10852,12 @@ func TestDAGInsert(t *testing.T) { }, want: listeners( &Listener{ + Name: HTTPS_LISTENER_NAME, Port: 443, SecureVirtualHosts: securevirtualhosts( &SecureVirtualHost{ VirtualHost: VirtualHost{ - Name: "example.com", - ListenerName: "ingress_https", + Name: "example.com", }, TCPProxy: &TCPProxy{ Clusters: []*Cluster{