Tarantool development patches archive
 help / color / mirror / Atom feed
From: Kirill Shcherbatov <kshcherbatov@tarantool.org>
To: tarantool-patches@freelists.org
Cc: alexander.turenko@tarantool.org,
	Kirill Shcherbatov <kshcherbatov@tarantool.org>
Subject: [tarantool-patches] [PATCH v1 1/1] box: updated httpc error message
Date: Mon, 22 Apr 2019 16:09:20 +0300	[thread overview]
Message-ID: <0ea35912fd62474e517d9a4bc422f944112ab41c.1555938495.git.kshcherbatov@tarantool.org> (raw)

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

             reply	other threads:[~2019-04-22 13:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-22 13:09 Kirill Shcherbatov [this message]
2019-04-22 13:18 ` [tarantool-patches] " Alexander Turenko
2019-04-22 15:00   ` Kirill Shcherbatov
2019-04-23 11:55 ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0ea35912fd62474e517d9a4bc422f944112ab41c.1555938495.git.kshcherbatov@tarantool.org \
    --to=kshcherbatov@tarantool.org \
    --cc=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [tarantool-patches] [PATCH v1 1/1] box: updated httpc error message' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox