Skip to content

Commit fdc6613

Browse files
committed
Run pipeline with default nginx directives in snippets
1 parent 69d1e3c commit fdc6613

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

tests/suite/manifests/snippets-filter/valid-sf.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ spec:
77
- context: main
88
value: worker_priority 0;
99
- context: http
10-
value: aio on;
10+
value: aio off;
1111
- context: http.server
12-
value: auth_delay 10s;
12+
value: auth_delay 0s;
1313
- context: http.server.location
14-
value: keepalive_time 10s;
14+
value: keepalive_time 1h;
1515
---
1616
apiVersion: gateway.nginx.org/v1alpha1
1717
kind: SnippetsFilter
1818
metadata:
1919
name: grpc-all-contexts
2020
spec:
2121
snippets:
22-
- context: main
23-
value: worker_shutdown_timeout 120s;
22+
# - context: main
23+
# value: worker_shutdown_timeout 120s;
2424
- context: http
2525
value: types_hash_bucket_size 64;
2626
- context: http.server

tests/suite/snippets_filter_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/nginx/nginx-gateway-fabric/v2/tests/framework"
1919
)
2020

21-
var _ = Describe("SnippetsFilter", Ordered, FlakeAttempts(2), Label("functional", "snippets-filter"), func() {
21+
var _ = Describe("SnippetsFilter", Ordered, Label("functional", "snippets-filter"), func() {
2222
var (
2323
files = []string{
2424
"snippets-filter/cafe.yaml",
@@ -144,7 +144,7 @@ var _ = Describe("SnippetsFilter", Ordered, FlakeAttempts(2), Label("functional"
144144
},
145145
{
146146
Directive: "aio",
147-
Value: "on",
147+
Value: "off",
148148
File: fmt.Sprintf("%s%s", httpContext, httpRouteSuffix),
149149
},
150150
{
@@ -154,7 +154,7 @@ var _ = Describe("SnippetsFilter", Ordered, FlakeAttempts(2), Label("functional"
154154
},
155155
{
156156
Directive: "auth_delay",
157-
Value: "10s",
157+
Value: "0s",
158158
File: fmt.Sprintf("%s%s", httpServerContext, httpRouteSuffix),
159159
},
160160
{
@@ -172,21 +172,21 @@ var _ = Describe("SnippetsFilter", Ordered, FlakeAttempts(2), Label("functional"
172172
},
173173
{
174174
Directive: "keepalive_time",
175-
Value: "10s",
175+
Value: "1h",
176176
File: fmt.Sprintf("%s%s", httpServerLocationContext, httpRouteSuffix),
177177
},
178178
}),
179179
Entry("GRPCRoute", []framework.ExpectedNginxField{
180-
{
181-
Directive: "worker_shutdown_timeout",
182-
Value: "120s",
183-
File: fmt.Sprintf("%s%s", mainContext, grpcRouteSuffix),
184-
},
185-
{
186-
Directive: "include",
187-
Value: fmt.Sprintf("%s%s", mainContext, grpcRouteSuffix),
188-
File: "main.conf",
189-
},
180+
// {
181+
// Directive: "worker_shutdown_timeout",
182+
// Value: "120s",
183+
// File: fmt.Sprintf("%s%s", mainContext, grpcRouteSuffix),
184+
// },
185+
// {
186+
// Directive: "include",
187+
// Value: fmt.Sprintf("%s%s", mainContext, grpcRouteSuffix),
188+
// File: "main.conf",
189+
// },
190190
{
191191
Directive: "types_hash_bucket_size",
192192
Value: "64",

0 commit comments

Comments
 (0)