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 6602D304C9 for ; Thu, 6 Jun 2019 23:50:13 -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 X0Q6mIYM4D1e for ; Thu, 6 Jun 2019 23:50:13 -0400 (EDT) Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 AE1982FF7D for ; Thu, 6 Jun 2019 23:50:12 -0400 (EDT) From: "Alexander V. Tikhonov" Subject: [tarantool-patches] [PATCH v1] test: Enable http_client test Date: Fri, 7 Jun 2019 06:50:07 +0300 Message-Id: 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: Kirill Yukhin Cc: "Alexander V. Tikhonov" , Alexander Turenko , tarantool-patches@freelists.org Removed skip flag file to switch on the testing of the http_client test. Enabled http_client test on OSX, fixed missing of the python2 symlink. Removed the subtest on '595 error return' from 'error' suite, due to it may hang forever. To enable test on travis-ci reverted commit: 1d7285c423c94ac006eb6ed80dc97986d79025b5 ('Disable flaky http_client.test.lua') Closes #4254 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4254-try-on-travis Issue: https://github.com/tarantool/tarantool/issues/4254 .travis.mk | 4 ++-- test/app-tap/http_client.skipcond | 7 ------- test/app-tap/http_client.test.lua | 9 +++------ 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 test/app-tap/http_client.skipcond diff --git a/.travis.mk b/.travis.mk index 55bee9980..e3bf28c53 100644 --- a/.travis.mk +++ b/.travis.mk @@ -49,7 +49,7 @@ test_ubuntu: deps_ubuntu deps_osx: brew update - brew install openssl readline curl icu4c --force + brew install python2 openssl readline curl icu4c --force curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python pip install -r test-run/requirements.txt @@ -62,7 +62,7 @@ test_osx: deps_osx ulimit -S -n 20480 || : ulimit -n make -j8 - cd test && python test-run.py --force -j 1 unit/ app/ app-tap/ box/ box-tap/ + cd test && ./test-run.py --force -j 1 unit/ app/ app-tap/ box/ box-tap/ coverage_ubuntu: deps_ubuntu cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON diff --git a/test/app-tap/http_client.skipcond b/test/app-tap/http_client.skipcond deleted file mode 100644 index c5713ff1f..000000000 --- a/test/app-tap/http_client.skipcond +++ /dev/null @@ -1,7 +0,0 @@ -import os - -# Travis CI fails to start httpd.py for unknown reason -if os.environ.get('TRAVIS', False): - self.skip = 1 - -# vim: set ft=python : diff --git a/test/app-tap/http_client.test.lua b/test/app-tap/http_client.test.lua index 9b911bc26..680c78b35 100755 --- a/test/app-tap/http_client.test.lua +++ b/test/app-tap/http_client.test.lua @@ -260,7 +260,7 @@ local function test_post_and_get(test, url, opts) end local function test_errors(test) - test:plan(3) + test:plan(2) local http = client:new() local status, err = pcall(http.get, http, "htp://mail.ru") test:ok(not status and string.find(json.encode(err), @@ -271,7 +271,6 @@ local function test_errors(test) "Unsupported protocol"), "POST: exception on bad protocol") local r = http:get("http://do_not_exist_8ffad33e0cb01e6a01a03d00089e71e5b2b7e9930dfcba.ru") - test:is(r.status, 595, "GET: response on bad url") end -- gh-3679 allow only headers can be converted to string @@ -559,16 +558,14 @@ local function test_concurrent(test, url, opts) end function run_tests(test, sock_family, sock_addr) - test:plan(10) + test:plan(11) local server, url, opts = start_server(test, sock_family, sock_addr) test:test("http.client", test_http_client, url, opts) test:test("http.client headers redefine", test_http_client_headers_redefine, url, opts) test:test("cancel and errinj", test_cancel_and_errinj, url .. 'long_query', opts) test:test("basic http post/get", test_post_and_get, url, opts) --- disabled, please make test local, the internet is not always available --- and quick during a test, gh-4254 --- test:test("errors", test_errors) + test:test("errors", test_errors) test:test("request_headers", test_request_headers, url, opts) test:test("headers", test_headers, url, opts) test:test("special methods", test_special_methods, url, opts) -- 2.17.1