@@ -35,12 +35,16 @@ g.before_all = function()
35
35
' universe' , nil , {if_not_exists = true }
36
36
)
37
37
38
- _G . my_error = my_error
39
- _G . remote_4args_fn = remote_4args_fn
38
+ rawset ( _G , ' my_error' , my_error )
39
+ rawset ( _G , ' remote_4args_fn' , remote_4args_fn )
40
40
end
41
41
42
42
g .before_each (function ()
43
43
g .conn = netbox .connect (' 127.0.0.1:3301' )
44
+ local ok , err = pcall (g .conn .call , g .conn , ' table.insert' , {{}, {}}, {timeout = 0 })
45
+ t .assert_not (ok )
46
+ g .timeout_error = tostring (err )
47
+ t .assert (g .timeout_error == ' Timeout exceeded' or g .timeout_error == ' timed out' )
44
48
end )
45
49
46
50
function g .test_errors_netbox_eval ()
@@ -109,7 +113,7 @@ function g.test_errors_netbox_eval()
109
113
110
114
111
115
local _l1 , remote_fn = h .get_line (), function () return nil , my_error :new (' Fuschia Platinum' ) end
112
- _G . remote_fn = remote_fn
116
+ rawset ( _G , ' remote_fn' , remote_fn )
113
117
114
118
local _l2 , _ , err = h .get_line (), errors .netbox_eval (g .conn , ' return remote_fn()' )
115
119
h .check_error (err , {
@@ -159,8 +163,8 @@ function g.test_errors_netbox_eval()
159
163
local _l , _ , err = h .get_line (), errors .netbox_eval (conn , ' return true' )
160
164
h .check_error (err , {
161
165
file = ' builtin/box/net_box.lua' ,
162
- err = ' "127.0.0.1:9": Connection refused ' ,
163
- str = ' ^NetboxEvalError: "127.0.0.1:9": Connection refused \n ' ..
166
+ err = ' "127.0.0.1:9": ' .. conn . error ,
167
+ str = ' ^NetboxEvalError: "127.0.0.1:9": ' .. conn . error .. ' \n ' ..
164
168
' stack traceback:\n ' ..
165
169
' .+\n ' ..
166
170
(' \t %s:%d: .*$' ):format (current_file , _l )
@@ -179,7 +183,7 @@ function g.test_errors_netbox_call()
179
183
}, ' netbox_call(fn_undefined)' )
180
184
181
185
local _l1 , remote_fn = h .get_line (), function () return nil , my_error :new (' Yellow Iron' ) end
182
- _G . remote_fn = remote_fn
186
+ rawset ( _G , ' remote_fn' , remote_fn )
183
187
184
188
local _l2 , _ , err = h .get_line (), errors .netbox_call (g .conn , ' remote_fn' )
185
189
h .check_error (err , {
@@ -220,16 +224,16 @@ end
220
224
function g .test_errors_netbox_wait_async ()
221
225
-- future returns error
222
226
local long_call = function () fiber .sleep (10 ) return 5 end
223
- _G . long_call = long_call
227
+ rawset ( _G , ' long_call' , long_call )
224
228
225
229
local csw1 = h .fiber_csw ()
226
230
227
231
local future_call = errors .netbox_call (g .conn , ' _G.long_call' , nil , {is_async = true })
228
232
local _l , _ , err = h .get_line (), errors .netbox_wait_async (future_call , 0 )
229
233
h .check_error (err , {
230
234
file = debug.getinfo (errors .netbox_wait_async ).source :gsub (' @' , ' ' ),
231
- err = ' "127.0.0.1:3301": Timeout exceeded ' ,
232
- str = ' ^NetboxCallError: "127.0.0.1:3301": Timeout exceeded \n ' ..
235
+ err = ' "127.0.0.1:3301": ' .. g . timeout_error ,
236
+ str = ' ^NetboxCallError: "127.0.0.1:3301": ' .. g . timeout_error .. ' \n ' ..
233
237
' stack traceback:\n ' ..
234
238
' .+\n ' ..
235
239
(' \t %s:%d: .*$' ):format (current_file , _l )
@@ -239,8 +243,8 @@ function g.test_errors_netbox_wait_async()
239
243
local _l , _ , err = h .get_line (), errors .netbox_wait_async (future_eval , 0 )
240
244
h .check_error (err , {
241
245
file = debug.getinfo (errors .netbox_wait_async ).source :gsub (' @' , ' ' ),
242
- err = ' "127.0.0.1:3301": Timeout exceeded ' ,
243
- str = ' ^NetboxEvalError: "127.0.0.1:3301": Timeout exceeded \n ' ..
246
+ err = ' "127.0.0.1:3301": ' .. g . timeout_error ,
247
+ str = ' ^NetboxEvalError: "127.0.0.1:3301": ' .. g . timeout_error .. ' \n ' ..
244
248
' stack traceback:\n ' ..
245
249
' .+\n ' ..
246
250
(' \t %s:%d: .*$' ):format (current_file , _l )
@@ -421,7 +425,7 @@ function g.test_errors_wrap_remote()
421
425
}, ' wrap conn:eval("return nil, e:new()")' )
422
426
423
427
local _l1 , remote_fn = h .get_line (), function () return nil , my_error :new (' Fuschia Platinum' ) end
424
- _G . remote_fn = remote_fn
428
+ rawset ( _G , ' remote_fn' , remote_fn )
425
429
426
430
local _l2 , _ , err = h .get_line (), errors .wrap (g .conn :eval (' return remote_fn()' ))
427
431
h .check_error (err , {
@@ -438,7 +442,7 @@ function g.test_errors_wrap_remote()
438
442
}, ' wrap conn:eval("return remote_fn()")' )
439
443
440
444
local _l1 , remote_fn = h .get_line (), function () return nil , my_error :new (' Yellow Iron' ) end
441
- _G . remote_fn = remote_fn
445
+ rawset ( _G , ' remote_fn' , remote_fn )
442
446
443
447
local _l2 , _ , err = h .get_line (), errors .wrap (g .conn :call (' remote_fn' ))
444
448
h .check_error (err , {
0 commit comments