Skip to content

Commit c7827e4

Browse files
spacewanderagentzh
spacewander
authored and
agentzh
committed
tests: the gap between TRACE and trace id might be less than three spaces.
Signed-off-by: Yichun Zhang (agentzh) <[email protected]>
1 parent 2e8b045 commit c7827e4

22 files changed

+166
-166
lines changed

‎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\(nginx\.conf:\d+\):3 loop\]/
57+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
7777
GET /base64
7878
--- response_body eval: "\n"
7979
--- error_log eval
80-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
80+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
104+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
128+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
156+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
184+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
185185
--- no_error_log
186186
[error]
187187
-- NYI:

‎t/encode-base64.t‎

Lines changed: 8 additions & 8 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\(nginx\.conf:\d+\):3 loop\]/
57+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
7777
GET /base64
7878
--- response_body eval: "\n"
7979
--- error_log eval
80-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
80+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
104+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
128+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
152+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
176+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
177177
--- no_error_log
178178
[error]
179179
-- NYI:
@@ -197,7 +197,7 @@ GET /base64
197197
--- response_body
198198
My4xNA
199199
--- error_log eval
200-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
200+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
201201
--- no_error_log
202202
[error]
203203
-- NYI:
@@ -221,7 +221,7 @@ GET /base64
221221
--- response_body
222222
My4xNA==
223223
--- error_log eval
224-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
224+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
225225
--- no_error_log
226226
[error]
227227
-- NYI:

‎t/errlog-raw-log.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ qr/\[error\] \S+: \S+ hello world/
138138
--- request
139139
GET /log
140140
--- error_log eval
141-
qr/\[TRACE \d+ content_by_lua\(nginx.conf:\d+\):4 loop\]/
141+
qr/\[TRACE\s+\d+ content_by_lua\(nginx.conf:\d+\):4 loop\]/
142142
143143
144144

‎t/master-pid-single-process.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ GET /t
7171
got: \d+ \(number\)
7272
\z
7373
--- error_log eval
74-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):\d loop\]/
74+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):\d loop\]/
7575
--- no_error_log
7676
[error]
7777
-- NYI:

‎t/master-pid.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ GET /t
7171
got: \d+ \(number\)
7272
\z
7373
--- error_log eval
74-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):\d loop\]/
74+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):\d loop\]/
7575
--- no_error_log
7676
[error]
7777
-- NYI:

‎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\(nginx\.conf:\d+\):3 loop\]/
57+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
80+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):3 loop\]/
103+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
104104
--- no_error_log
105105
[error]
106106
@@ -123,6 +123,6 @@ GET /md5_bin
123123
--- response_body
124124
16
125125
--- error_log eval
126-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
126+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):3 loop\]/
127127
--- no_error_log
128128
[error]

‎t/md5.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ GET /md5
4646
--- response_body
4747
5d41402abc4b2a76b9719d911017c592
4848
--- error_log eval
49-
qr/\[TRACE 1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
49+
qr/\[TRACE\s+1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
5050
--- no_error_log
5151
[error]
5252
@@ -69,7 +69,7 @@ GET /md5
6969
--- response_body
7070
d41d8cd98f00b204e9800998ecf8427e
7171
--- error_log eval
72-
qr/\[TRACE 1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
72+
qr/\[TRACE\s+1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
7373
--- no_error_log
7474
[error]
7575
@@ -92,7 +92,7 @@ GET /md5
9292
--- response_body
9393
d41d8cd98f00b204e9800998ecf8427e
9494
--- error_log eval
95-
qr/\[TRACE 1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
95+
qr/\[TRACE\s+1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
9696
--- no_error_log
9797
[error]
9898
@@ -115,6 +115,6 @@ GET /md5
115115
--- response_body
116116
4beed3b9c4a886067de0e3a094246f78
117117
--- error_log eval
118-
qr/\[TRACE 1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
118+
qr/\[TRACE\s+1 content_by_lua\(nginx\.conf:\d+\):3 loop\]/
119119
--- no_error_log
120120
[error]

‎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\(nginx\.conf:\d+\):5 loop\]/
77+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):5 loop\]/
116+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):5 loop\]/
153+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):4 loop\]/
191+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):4 loop\]/
226+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
227227
228228
229229
@@ -259,4 +259,4 @@ matched: 234
259259
[error]
260260
NYI
261261
--- error_log eval
262-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
262+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/

‎t/re-gmatch.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ GET /re
6464
matched: hello
6565
matched: world
6666
--- error_log eval
67-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
67+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
6868
--- no_error_log
6969
[error]
7070
@@ -92,7 +92,7 @@ GET /re
9292
matched: hello
9393
matched: world
9494
--- error_log eval
95-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
95+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
9696
--- no_error_log
9797
[error]
9898
@@ -124,7 +124,7 @@ GET /re
124124
--- response_body
125125
no match
126126
--- error_log eval
127-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
127+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
128128
--- no_error_log
129129
[error]
130130
@@ -156,7 +156,7 @@ GET /re
156156
--- response_body
157157
no match
158158
--- error_log eval
159-
qr/\[TRACE \d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
159+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
160160
--- no_error_log
161161
[error]
162162

‎t/re-match.t‎

Lines changed: 8 additions & 8 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\(nginx\.conf:\d+\):4 loop\]/
77+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):4 loop\]/
114+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):4 loop\]/
150+
qr/\[TRACE\s+\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\(nginx\.conf:\d+\):4 loop\]/
185+
qr/\[TRACE\s+\d+ content_by_lua\(nginx\.conf:\d+\):4 loop\]/
186186
--- no_error_log
187187
[error]
188188
bad argument type
@@ -264,7 +264,7 @@ $1: 1
264264
$2: 234
265265
$3: nil
266266
--- error_log eval
267-
qr/\[TRACE \d+/
267+
qr/\[TRACE\s+\d+/
268268
--- no_error_log
269269
[error]
270270
bad argument type
@@ -305,7 +305,7 @@ hello
305305
nil
306306
307307
--- error_log eval
308-
qr/\[TRACE \d+/
308+
qr/\[TRACE\s+\d+/
309309
--- no_error_log
310310
[error]
311311
bad argument type
@@ -343,7 +343,7 @@ NYI
343343
error: pcre_compile\(\) failed: two named subpatterns have the same name
344344
345345
--- error_log eval
346-
qr/\[TRACE \d+/
346+
qr/\[TRACE\s+\d+/
347347
--- no_error_log
348348
[error]
349349
bad argument type
@@ -390,7 +390,7 @@ h|ello
390390
nil
391391
392392
--- error_log eval
393-
qr/\[TRACE \d+/
393+
qr/\[TRACE\s+\d+/
394394
--- no_error_log
395395
[error]
396396
bad argument type

0 commit comments

Comments
 (0)