Skip to content

Commit 240103c

Browse files
committed
fix more failed tests.
1 parent 697c75c commit 240103c

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

t/139-ssl-cert-by.t

+12-12
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ received: foo
112112
close: 1 nil
113113

114114
--- error_log
115-
lua ssl server name: "test.com"
115+
lua tls server name: "test.com"
116116

117117
--- no_error_log
118118
[error]
@@ -217,7 +217,7 @@ close: 1 nil
217217

218218
--- error_log eval
219219
[
220-
'lua ssl server name: "test.com"',
220+
'lua tls server name: "test.com"',
221221
qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
222222
]
223223
@@ -321,7 +321,7 @@ received: foo
321321
close: 1 nil
322322

323323
--- error_log
324-
lua ssl server name: "test.com"
324+
lua tls server name: "test.com"
325325
my timer run!
326326

327327
--- no_error_log
@@ -439,7 +439,7 @@ received: foo
439439
close: 1 nil
440440

441441
--- error_log
442-
lua ssl server name: "test.com"
442+
lua tls server name: "test.com"
443443
received memc reply: OK
444444

445445
--- no_error_log
@@ -922,7 +922,7 @@ connected: 1
922922
ssl handshake: cdata
923923

924924
--- error_log
925-
lua ssl server name: "test.com"
925+
lua tls server name: "test.com"
926926
get_phase: ssl_cert
927927

928928
--- no_error_log
@@ -986,7 +986,7 @@ connected: 1
986986
failed to do SSL handshake: timeout
987987

988988
--- error_log
989-
lua ssl server name: "test.com"
989+
lua tls server name: "test.com"
990990
ssl-cert-by-lua: after sleeping
991991

992992
--- no_error_log
@@ -1044,7 +1044,7 @@ failed to do SSL handshake: handshake failed
10441044

10451045
--- error_log eval
10461046
[
1047-
'lua ssl server name: "test.com"',
1047+
'lua tls server name: "test.com"',
10481048
'ssl_certificate_by_lua:1: API disabled in the context of ssl_certificate_by_lua*',
10491049
qr/\[info\] .*?cert cb error/,
10501050
]
@@ -1144,7 +1144,7 @@ received: foo
11441144
close: 1 nil
11451145

11461146
--- error_log
1147-
lua ssl server name: "test.com"
1147+
lua tls server name: "test.com"
11481148
a.lua:1: ssl cert by lua is running!
11491149

11501150
--- no_error_log
@@ -1264,7 +1264,7 @@ co resume, status: suspended
12641264
co yield: 2
12651265

12661266
--- error_log
1267-
lua ssl server name: "test.com"
1267+
lua tls server name: "test.com"
12681268

12691269
--- no_error_log
12701270
[error]
@@ -1475,7 +1475,7 @@ received: foo
14751475
close: 1 nil
14761476

14771477
--- error_log
1478-
lua ssl server name: "test.com"
1478+
lua tls server name: "test.com"
14791479
ssl_certificate_by_lua:1: ssl cert by lua is running!
14801480

14811481
--- no_error_log
@@ -1575,7 +1575,7 @@ close: 1 nil
15751575
--- error_log eval
15761576
[
15771577
qr/\[error\] .*? send\(\) failed/,
1578-
'lua ssl server name: "test.com"',
1578+
'lua tls server name: "test.com"',
15791579
]
15801580
--- no_error_log
15811581
[alert]
@@ -1677,7 +1677,7 @@ close: 1 nil
16771677
--- error_log eval
16781678
[
16791679
'ssl_certificate_by_lua:1: ssl cert by lua is running!',
1680-
'lua ssl server name: "test.com"',
1680+
'lua tls server name: "test.com"',
16811681
]
16821682
--- no_error_log
16831683
[error]

t/140-ssl-c-api.t

+5-5
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ received: foo
224224
close: 1 nil
225225
226226
--- error_log
227-
lua ssl server name: "test.com"
227+
lua tls server name: "test.com"
228228
229229
--- no_error_log
230230
[error]
@@ -378,7 +378,7 @@ received: foo
378378
close: 1 nil
379379
380380
--- error_log
381-
lua ssl server name: "test.com"
381+
lua tls server name: "test.com"
382382
383383
--- no_error_log
384384
[error]
@@ -506,7 +506,7 @@ received: foo
506506
close: 1 nil
507507
508508
--- error_log
509-
lua ssl server name: "test.com"
509+
lua tls server name: "test.com"
510510
failed to parse PEM cert: PEM_read_bio_X509_AUX()
511511
failed to parse PEM priv key: PEM_read_bio_PrivateKey() failed
512512
@@ -657,7 +657,7 @@ received: foo
657657
close: 1 nil
658658
659659
--- error_log
660-
lua ssl server name: "test.com"
660+
lua tls server name: "test.com"
661661
662662
--- no_error_log
663663
[error]
@@ -807,7 +807,7 @@ received: foo
807807
close: 1 nil
808808
809809
--- error_log
810-
lua ssl server name: "test.com"
810+
lua tls server name: "test.com"
811811
812812
--- no_error_log
813813
[error]

t/142-ssl-session-store.t

+7-7
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ssl handshake: cdata
8181
close: 1 nil
8282
8383
--- error_log
84-
lua ssl server name: "test.com"
84+
lua tls server name: "test.com"
8585
8686
--- no_error_log
8787
[error]
@@ -156,7 +156,7 @@ ssl handshake: cdata
156156
close: 1 nil
157157
158158
--- error_log
159-
lua ssl server name: "test.com"
159+
lua tls server name: "test.com"
160160
API disabled in the context of ssl_session_store_by_lua*
161161
162162
--- no_error_log
@@ -231,7 +231,7 @@ ssl handshake: cdata
231231
close: 1 nil
232232
233233
--- error_log
234-
lua ssl server name: "test.com"
234+
lua tls server name: "test.com"
235235
my timer run!
236236
237237
--- no_error_log
@@ -323,7 +323,7 @@ ssl handshake: cdata
323323
close: 1 nil
324324
325325
--- error_log
326-
lua ssl server name: "test.com"
326+
lua tls server name: "test.com"
327327
API disabled in the context of ssl_session_store_by_lua*
328328
329329
--- no_error_log
@@ -676,7 +676,7 @@ close: 1 nil
676676
677677
--- error_log eval
678678
[
679-
'lua ssl server name: "test.com"',
679+
'lua tls server name: "test.com"',
680680
qr/elapsed in ssl cert by lua: 0.(?:09|1[01])\d+,/,
681681
'ssl_session_store_by_lua_block:1: ssl store session by lua is running!',
682682
]
@@ -748,7 +748,7 @@ ssl handshake: cdata
748748
close: 1 nil
749749
750750
--- error_log
751-
lua ssl server name: "test.com"
751+
lua tls server name: "test.com"
752752
a.lua:1: ssl store session by lua is running!
753753
754754
--- no_error_log
@@ -895,7 +895,7 @@ ssl handshake: cdata
895895
close: 1 nil
896896
897897
--- error_log
898-
lua ssl server name: "test.com"
898+
lua tls server name: "test.com"
899899
ssl_session_store_by_lua_block:1: ssl session store by lua is running!
900900
901901
--- no_error_log

0 commit comments

Comments
 (0)