fix lint errors and update directives

Author: salonichf5

tests/suite/manifests/snippets-filter/gateway.yaml

@@ -9,4 +9,3 @@ spec:
     port: 80
     protocol: HTTP
     hostname: "*.example.com"
-

tests/suite/manifests/snippets-filter/grpc-backend.yaml

@@ -37,4 +37,3 @@ spec:
         resources:
           requests:
             cpu: 10m
-

tests/suite/manifests/snippets-filter/invalid-context-sf.yaml

@@ -34,4 +34,4 @@ spec:
           name: invalid-context
     backendRefs:
     - name: soda
-      port: 80
+      port: 80

tests/suite/snippets_filter_test.go

@@ -25,8 +25,6 @@ var _ = Describe("SnippetsFilter", Ordered, Label("functional", "snippets-filter
 			"snippets-filter/cafe.yaml",
 			"snippets-filter/gateway.yaml",
 			"snippets-filter/grpc-backend.yaml",
-			"snippets-filter/cafe-routes.yaml",
-			"snippets-filter/grpc-route.yaml",
 		}
 
 		namespace = "snippets-filter"
@@ -128,11 +126,21 @@ var _ = Describe("SnippetsFilter", Ordered, Label("functional", "snippets-filter
 						Value:     "0",
 						File:      fmt.Sprintf("%s%s", mainContext, httpRouteSuffix),
 					},
+					{
+						Directive: "include",
+						Value:     fmt.Sprintf("%s%s", mainContext, httpRouteSuffix),
+						File:      "main.conf",
+					},
 					{
 						Directive: "aio",
 						Value:     "on",
 						File:      fmt.Sprintf("%s%s", httpContext, httpRouteSuffix),
 					},
+					{
+						Directive: "include",
+						Value:     fmt.Sprintf("%s%s", httpContext, httpRouteSuffix),
+						File:      "http.conf",
+					},
 					{
 						Directive: "auth_delay",
 						Value:     "10s",
@@ -163,27 +171,37 @@ var _ = Describe("SnippetsFilter", Ordered, Label("functional", "snippets-filter
 						Value:     "120s",
 						File:      fmt.Sprintf("%s%s", mainContext, grpcRouteSuffix),
 					},
+					{
+						Directive: "include",
+						Value:     fmt.Sprintf("%s%s", mainContext, grpcRouteSuffix),
+						File:      "main.conf",
+					},
 					{
 						Directive: "types_hash_bucket_size",
 						Value:     "64",
 						File:      fmt.Sprintf("%s%s", httpContext, grpcRouteSuffix),
 					},
 					{
-						Directive: "server_tokens",
-						Value:     "on",
-						File:      fmt.Sprintf("%s%s", httpServerContext, grpcRouteSuffix),
+						Directive: "include",
+						Value:     fmt.Sprintf("%s%s", httpContext, grpcRouteSuffix),
+						File:      "http.conf",
 					},
 					{
-						Directive: "tcp_nodelay",
+						Directive: "server_tokens",
 						Value:     "on",
-						File:      fmt.Sprintf("%s%s", httpServerLocationContext, grpcRouteSuffix),
+						File:      fmt.Sprintf("%s%s", httpServerContext, grpcRouteSuffix),
 					},
 					{
 						Directive: "include",
 						Value:     fmt.Sprintf("%s%s", httpServerContext, grpcRouteSuffix),
 						Servers:   []string{"*.example.com"},
 						File:      "http.conf",
 					},
+					{
+						Directive: "tcp_nodelay",
+						Value:     "on",
+						File:      fmt.Sprintf("%s%s", httpServerLocationContext, grpcRouteSuffix),
+					},
 					{
 						Directive: "include",
 						Value:     fmt.Sprintf("%s%s", httpServerLocationContext, grpcRouteSuffix),
@@ -222,7 +240,7 @@ var _ = Describe("SnippetsFilter", Ordered, Label("functional", "snippets-filter
 })
 
 func waitForHTTPRouteToHaveGatewayNotProgrammedCond(httpRouteNsName types.NamespacedName) error {
-	ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.GetStatusTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.GetStatusTimeout*2)
 	defer cancel()
 
 	GinkgoWriter.Printf(
@@ -232,7 +250,7 @@ func waitForHTTPRouteToHaveGatewayNotProgrammedCond(httpRouteNsName types.Namesp
 
 	return wait.PollUntilContextCancel(
 		ctx,
-		time.Second*3,
+		time.Second*1,
 		true, /* poll immediately */
 		func(ctx context.Context) (bool, error) {
 			var hr v1.HTTPRoute