diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in index f0529734f656824eec654dbd8e5494f9551491ea..70747bd0cb078c0012197e483d5018f346acf378 100755 --- a/extra/dist/tarantoolctl.in +++ b/extra/dist/tarantoolctl.in @@ -785,7 +785,6 @@ local function eval() end local error_response = yaml.decode(full_response)[1] if type(error_response) == 'table' and error_response.error then - log.error("Error while reloading config:") log.error(error_response.error) return 3 end diff --git a/test/app-tap/tarantoolctl.test.lua b/test/app-tap/tarantoolctl.test.lua index cc4ca17b6adecef72d584ed2b6267cba279374bd..ac9a208ca2d2ddb42ccecb833f2fcbd2cda6e6c2 100755 --- a/test/app-tap/tarantoolctl.test.lua +++ b/test/app-tap/tarantoolctl.test.lua @@ -202,7 +202,7 @@ do local status, err = pcall(function() test:test("basic test for bad script", function(test_i) - test_i:plan(8) + test_i:plan(7) check_ok(test_i, dir, 'start', 'script', 1, nil, 'Instance script is not found') check_ok(test_i, dir, 'start', 'bad_script', 1, nil, @@ -211,7 +211,7 @@ do tctl_wait_start(dir, 'good_script') -- wait here check_ok(test_i, dir, 'eval', 'good_script bad_script.lua', 3, - nil, 'Error while reloading config:') + nil, nil) check_ok(test_i, dir, 'stop', 'good_script', 0) end) end) @@ -238,11 +238,11 @@ do local status, err = pcall(function() test:test("check answers in case of call", function(test_i) - test_i:plan(6) + test_i:plan(5) check_ok(test_i, dir, 'start', 'good_script', 0) tctl_wait_start(dir, 'good_script') - check_ok(test_i, dir, 'eval', 'good_script bad_script.lua', 3, nil, - 'Error while reloading config') + check_ok(test_i, dir, 'eval', 'good_script bad_script.lua', 3, + nil, nil) check_ok(test_i, dir, 'eval', 'good_script ok_script.lua', 0, '---\n- 1\n...', nil) check_ok(test_i, dir, 'stop', 'good_script', 0)