From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 4CC5223137 for ; Mon, 22 Apr 2019 09:09:25 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uZxwt-xn3Oo0 for ; Mon, 22 Apr 2019 09:09:25 -0400 (EDT) Received: from smtp44.i.mail.ru (smtp44.i.mail.ru [94.100.177.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id CD836253BE for ; Mon, 22 Apr 2019 09:09:24 -0400 (EDT) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v1 1/1] box: updated httpc error message Date: Mon, 22 Apr 2019 16:09:20 +0300 Message-Id: <0ea35912fd62474e517d9a4bc422f944112ab41c.1555938495.git.kshcherbatov@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tarantool-patches@freelists.org Cc: alexander.turenko@tarantool.org, Kirill Shcherbatov Previously Tarantool used to raise the confusing error message in case of invalid usage of the httpc module. Fixed to follow the current module API. Closes #4136 --- http://github.com/tarantool/tarantool/tree/kshch/gh-4136-httpc-invalid-usage https://github.com/tarantool/tarantool/issues/4136 src/lua/httpc.lua | 2 +- test/app-tap/http_client.test.lua | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lua/httpc.lua b/src/lua/httpc.lua index cd44b6054..b767d14eb 100644 --- a/src/lua/httpc.lua +++ b/src/lua/httpc.lua @@ -294,7 +294,7 @@ curl_mt = { -- request = function(self, method, url, body, opts) if not method or not url then - error('request(method, url [, options]])') + error('request(method, url [, body, [options]])') end local resp = self.curl:request(method, url, body, opts or {}) if resp and resp.headers then diff --git a/test/app-tap/http_client.test.lua b/test/app-tap/http_client.test.lua index 0a323be9b..00dd3a251 100755 --- a/test/app-tap/http_client.test.lua +++ b/test/app-tap/http_client.test.lua @@ -62,10 +62,14 @@ local function stop_server(test, server) end local function test_http_client(test, url, opts) - test:plan(10) + test:plan(11) test:isnil(rawget(_G, 'http'), "global namespace is not polluted"); test:isnil(rawget(_G, 'http.client'), "global namespace is not polluted"); + local ok, err = pcall(client.request, client) + local usage_err = "request(method, url [, body, [options]])" + test:is_deeply({ok, tostring(err):split(': ')[2]}, {false, usage_err}, + "test httpc usage") local r = client.get(url, opts) test:is(r.status, 200, 'simple 200') test:is(r.reason, 'Ok', '200 - Ok') -- 2.21.0