move the t.Run to be around the full v1 and v2 test cases

hashicorp · Aug 11, 2023 · 39d63d3 · 39d63d3
1 parent c23aac1
commit 39d63d3
Showing 1 changed file with 31 additions and 31 deletions.
diff --git a/agent/xds/listeners_test.go b/agent/xds/listeners_test.go
@@ -1301,24 +1301,24 @@ func TestListenersFromSnapshot(t *testing.T) {
 
 					var listeners []proto.Message
 
-					// Need server just for logger dependency
-					g := NewResourceGenerator(testutil.Logger(t), nil, false)
-					g.ProxyFeatures = sf
-					if tt.generatorSetup != nil {
-						tt.generatorSetup(g)
-					}
-					listeners, err = g.listenersFromSnapshot(snap)
-					require.NoError(t, err)
-					// The order of listeners returned via LDS isn't relevant, so it's safe
-					// to sort these for the purposes of test comparisons.
-					sort.Slice(listeners, func(i, j int) bool {
-						return listeners[i].(*envoy_listener_v3.Listener).Name < listeners[j].(*envoy_listener_v3.Listener).Name
-					})
+					t.Run("current-xdsv1", func(t *testing.T) {
+						// Need server just for logger dependency
+						g := NewResourceGenerator(testutil.Logger(t), nil, false)
+						g.ProxyFeatures = sf
+						if tt.generatorSetup != nil {
+							tt.generatorSetup(g)
+						}
+						listeners, err = g.listenersFromSnapshot(snap)
+						require.NoError(t, err)
+						// The order of listeners returned via LDS isn't relevant, so it's safe
+						// to sort these for the purposes of test comparisons.
+						sort.Slice(listeners, func(i, j int) bool {
+							return listeners[i].(*envoy_listener_v3.Listener).Name < listeners[j].(*envoy_listener_v3.Listener).Name
+						})
 
-					r, err := createResponse(xdscommon.ListenerType, "00000001", "00000001", listeners)
-					require.NoError(t, err)
+						r, err := createResponse(xdscommon.ListenerType, "00000001", "00000001", listeners)
+						require.NoError(t, err)
 
-					t.Run("current-xdsv1", func(t *testing.T) {
 						gotJSON := protoToJSON(t, r)
 
 						gName := tt.name
@@ -1331,25 +1331,25 @@ func TestListenersFromSnapshot(t *testing.T) {
 					})
 
 					if tt.alsoRunTestForV2 {
-						generator := xdsv2.NewResourceGenerator(testutil.Logger(t))
-						converter := proxystateconverter.NewConverter(testutil.Logger(t), nil)
-						proxyState, err := converter.ProxyStateFromSnapshot(snap)
-						require.NoError(t, err)
+						t.Run("current-xdsv2", func(t *testing.T) {
+							generator := xdsv2.NewResourceGenerator(testutil.Logger(t))
+							converter := proxystateconverter.NewConverter(testutil.Logger(t), nil)
+							proxyState, err := converter.ProxyStateFromSnapshot(snap)
+							require.NoError(t, err)
 
-						res, err := generator.AllResourcesFromIR(proxyState)
-						require.NoError(t, err)
+							res, err := generator.AllResourcesFromIR(proxyState)
+							require.NoError(t, err)
 
-						listeners = res[xdscommon.ListenerType]
-						// The order of listeners returned via LDS isn't relevant, so it's safe
-						// to sort these for the purposes of test comparisons.
-						sort.Slice(listeners, func(i, j int) bool {
-							return listeners[i].(*envoy_listener_v3.Listener).Name < listeners[j].(*envoy_listener_v3.Listener).Name
-						})
+							listeners = res[xdscommon.ListenerType]
+							// The order of listeners returned via LDS isn't relevant, so it's safe
+							// to sort these for the purposes of test comparisons.
+							sort.Slice(listeners, func(i, j int) bool {
+								return listeners[i].(*envoy_listener_v3.Listener).Name < listeners[j].(*envoy_listener_v3.Listener).Name
+							})
 
-						r, err := createResponse(xdscommon.ListenerType, "00000001", "00000001", listeners)
-						require.NoError(t, err)
+							r, err := createResponse(xdscommon.ListenerType, "00000001", "00000001", listeners)
+							require.NoError(t, err)
 
-						t.Run("current-xdsv2", func(t *testing.T) {
 							gotJSON := protoToJSON(t, r)
 
 							gName := tt.name