From dc648b9965e419bca86762d7f7e7c0b9bc62a7f4 Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov.dev@gmail.com>
Date: Mon, 20 Aug 2018 19:41:51 +0300
Subject: [PATCH] tarantoolctl: remove confusing message on eval error
If `tarantoolctl eval` fails, apart from returning 3 and printing the
eval error to stderr, tarantoolctl will also emit the following message:
Error while reloading config:
This message is quite confusing and useless too, as we have the return
code for that. Let's zap it.
Closes #3560
---
extra/dist/tarantoolctl.in | 1 -
test/app-tap/tarantoolctl.test.lua | 10 +++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
index f0529734f6..70747bd0cb 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 cc4ca17b6a..ac9a208ca2 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)
--
GitLab