Skip to content

Commit a851e05

Browse files
agentzhagentzh
committed
tests: updated the test suite to reflect recent changes in ngx_lua's Lua chunk names.
1 parent 2297eed commit a851e05

17 files changed

+108
-108
lines changed

‎t/ctx.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ctx.foo = 100
5858
-- NYI:
5959
bad argument
6060
--- error_log eval
61-
qr/\[TRACE\s+\d+\s+content_by_lua:2 loop\]/
61+
qr/\[TRACE\s+\d+\s+content_by_lua\(nginx\.conf:\d+\):2 loop\]/
6262
6363
6464
@@ -82,5 +82,5 @@ ctx.foo = 100
8282
-- NYI:
8383
bad argument
8484
--- error_log eval
85-
qr/\[TRACE\s+\d+\s+content_by_lua:2 loop\]/
85+
qr/\[TRACE\s+\d+\s+content_by_lua\(nginx\.conf:\d+\):2 loop\]/
8686

‎t/decode-base64.t

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ GET /base64
5454
--- response_body
5555
hello
5656
--- error_log eval
57-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
57+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
5858
--- no_error_log
5959
[error]
6060
-- NYI:
@@ -77,7 +77,7 @@ qr/\[TRACE \d+ content_by_lua:3 loop\]/
7777
GET /base64
7878
--- response_body eval: "\n"
7979
--- error_log eval
80-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
80+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
8181
--- no_error_log
8282
[error]
8383
-- NYI:
@@ -101,7 +101,7 @@ GET /base64
101101
--- response_body
102102
3.14
103103
--- error_log eval
104-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
104+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
105105
--- no_error_log
106106
[error]
107107
-- NYI:
@@ -125,7 +125,7 @@ GET /base64
125125
--- response_body
126126
true
127127
--- error_log eval
128-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
128+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
129129
--- no_error_log
130130
[error]
131131
-- NYI:
@@ -153,7 +153,7 @@ GET /base64
153153
--- response_body
154154
4095
155155
--- error_log eval
156-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
156+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
157157
--- no_error_log
158158
[error]
159159
-- NYI:
@@ -181,7 +181,7 @@ GET /base64
181181
--- response_body
182182
4096
183183
--- error_log eval
184-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
184+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
185185
--- no_error_log
186186
[error]
187187
-- NYI:

‎t/encode-base64.t

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ GET /base64
5454
--- response_body
5555
aGVsbG8=
5656
--- error_log eval
57-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
57+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
5858
--- no_error_log
5959
[error]
6060
-- NYI:
@@ -77,7 +77,7 @@ qr/\[TRACE \d+ content_by_lua:3 loop\]/
7777
GET /base64
7878
--- response_body eval: "\n"
7979
--- error_log eval
80-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
80+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
8181
--- no_error_log
8282
[error]
8383
-- NYI:
@@ -101,7 +101,7 @@ GET /base64
101101
--- response_body
102102
My4xNA==
103103
--- error_log eval
104-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
104+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
105105
--- no_error_log
106106
[error]
107107
-- NYI:
@@ -125,7 +125,7 @@ GET /base64
125125
--- response_body
126126
dHJ1ZQ==
127127
--- error_log eval
128-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
128+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
129129
--- no_error_log
130130
[error]
131131
-- NYI:
@@ -149,7 +149,7 @@ GET /base64
149149
--- response_body
150150
4100
151151
--- error_log eval
152-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
152+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
153153
--- no_error_log
154154
[error]
155155
-- NYI:
@@ -173,7 +173,7 @@ GET /base64
173173
--- response_body
174174
4096
175175
--- error_log eval
176-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
176+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
177177
--- no_error_log
178178
[error]
179179
-- NYI:

‎t/md5.t

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ __DATA__
4545
GET /md5
4646
--- response_body
4747
5d41402abc4b2a76b9719d911017c592
48-
--- error_log
49-
[TRACE 1 content_by_lua:3 loop]
48+
--- error_log eval
49+
qr/\[TRACE 1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
5050
--- no_error_log
5151
[error]
5252
@@ -68,8 +68,8 @@ GET /md5
6868
GET /md5
6969
--- response_body
7070
d41d8cd98f00b204e9800998ecf8427e
71-
--- error_log
72-
[TRACE 1 content_by_lua:3 loop]
71+
--- error_log eval
72+
qr/\[TRACE 1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
7373
--- no_error_log
7474
[error]
7575
@@ -91,8 +91,8 @@ d41d8cd98f00b204e9800998ecf8427e
9191
GET /md5
9292
--- response_body
9393
d41d8cd98f00b204e9800998ecf8427e
94-
--- error_log
95-
[TRACE 1 content_by_lua:3 loop]
94+
--- error_log eval
95+
qr/\[TRACE 1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
9696
--- no_error_log
9797
[error]
9898
@@ -114,8 +114,8 @@ d41d8cd98f00b204e9800998ecf8427e
114114
GET /md5
115115
--- response_body
116116
4beed3b9c4a886067de0e3a094246f78
117-
--- error_log
118-
[TRACE 1 content_by_lua:3 loop]
117+
--- error_log eval
118+
qr/\[TRACE 1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
119119
--- no_error_log
120120
[error]
121121

‎t/md5_bin.t

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ GET /md5_bin
5454
--- response_body
5555
16
5656
--- error_log eval
57-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
57+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
5858
--- no_error_log
5959
[error]
6060
@@ -77,7 +77,7 @@ GET /md5_bin
7777
--- response_body
7878
16
7979
--- error_log eval
80-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
80+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
8181
--- no_error_log
8282
[error]
8383
@@ -100,7 +100,7 @@ GET /md5_bin
100100
--- response_body
101101
16
102102
--- error_log eval
103-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
103+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
104104
--- no_error_log
105105
[error]
106106
@@ -123,7 +123,7 @@ GET /md5_bin
123123
--- response_body
124124
16
125125
--- error_log eval
126-
qr/\[TRACE \d+ content_by_lua:3 loop\]/
126+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
127127
--- no_error_log
128128
[error]
129129

‎t/misc.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ headers sent: false
8787
-- NYI:
8888
bad argument
8989
--- error_log eval
90-
qr/\[TRACE\s+\d+\s+content_by_lua:3 loop\]/
90+
qr/\[TRACE\s+\d+\s+content_by_lua\(nginx\.conf:\d+\):3 loop\]/
9191
9292
9393
@@ -113,5 +113,5 @@ headers sent: true
113113
-- NYI:
114114
bad argument
115115
--- error_log eval
116-
qr/\[TRACE\s+\d+\s+content_by_lua:4 loop\]/
116+
qr/\[TRACE\s+\d+\s+content_by_lua\(nginx\.conf:\d+\):4 loop\]/
117117

‎t/re-find.t

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ from: 1
7474
to: 1
7575
matched: a
7676
--- error_log eval
77-
qr/\[TRACE \d+ content_by_lua:5 loop\]/
77+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):5 loop\]/
7878
--- no_error_log
7979
[error]
8080
bad argument type
@@ -113,7 +113,7 @@ from: 1
113113
to: 1
114114
matched: a
115115
--- error_log eval
116-
qr/\[TRACE \d+ content_by_lua:5 loop\]/
116+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):5 loop\]/
117117
--- no_error_log
118118
[error]
119119
NYI
@@ -150,7 +150,7 @@ GET /re
150150
--- response_body
151151
no match
152152
--- error_log eval
153-
qr/\[TRACE \d+ content_by_lua:5 loop\]/
153+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):5 loop\]/
154154
--- no_error_log
155155
[error]
156156
NYI
@@ -188,7 +188,7 @@ not matched!
188188
[error]
189189
NYI
190190
--- error_log eval
191-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
191+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
192192
193193
194194
@@ -223,7 +223,7 @@ not matched!
223223
[error]
224224
NYI
225225
--- error_log eval
226-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
226+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
227227
228228
229229
@@ -259,5 +259,5 @@ matched: 234
259259
[error]
260260
NYI
261261
--- error_log eval
262-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
262+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
263263

‎t/re-match.t

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ GET /re
7474
matched: a
7575
$1: nil
7676
--- error_log eval
77-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
77+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
7878
--- no_error_log
7979
[error]
8080
bad argument type
@@ -111,7 +111,7 @@ GET /re
111111
matched: a
112112
$1: nil
113113
--- error_log eval
114-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
114+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
115115
--- no_error_log
116116
[error]
117117
NYI
@@ -147,7 +147,7 @@ GET /re
147147
--- response_body
148148
no match
149149
--- error_log eval
150-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
150+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
151151
--- no_error_log
152152
[error]
153153
@@ -182,7 +182,7 @@ GET /re
182182
--- response_body
183183
no match
184184
--- error_log eval
185-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
185+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
186186
--- no_error_log
187187
[error]
188188
bad argument type

‎t/re-sub.t

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ GET /re
6767
s: aBcbd
6868
n: 1
6969
--- error_log eval
70-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
70+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
7171
--- no_error_log
7272
[error]
7373
bad argument type
@@ -100,7 +100,7 @@ GET /re
100100
s: aBcbd
101101
n: 1
102102
--- error_log eval
103-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
103+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
104104
--- no_error_log
105105
[error]
106106
bad argument type
@@ -166,7 +166,7 @@ GET /re
166166
s: a[bc(c)]bd
167167
n: 1
168168
--- error_log eval
169-
qr/\[TRACE \d+ content_by_lua:4 loop\]/
169+
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
170170
171171
--- no_error_log
172172
[error]

0 commit comments

Comments
 (0)