[tarantool-patches] [PATCH v1 1/2] Enable http_client test

[tarantool-patches] [PATCH v1 1/2] Enable http_client test

[Alexander V. Tikhonov]

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 link. Removed the subtest
on '595 error return' from 'error' suite, due to it may
hang forever.

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 | 3 +--
 3 files changed, 3 insertions(+), 11 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..d1add3a04 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
-- 
2.17.1

[tarantool-patches] [PATCH v1 2/2] Revert "Disable flaky http_client.test.lua"

[Alexander V. Tikhonov]

Need to check on travis.
This reverts commit 1d7285c423c94ac006eb6ed80dc97986d79025b5.
---
 test/app-tap/http_client.test.lua | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/app-tap/http_client.test.lua b/test/app-tap/http_client.test.lua
index d1add3a04..680c78b35 100755
--- a/test/app-tap/http_client.test.lua
+++ b/test/app-tap/http_client.test.lua
@@ -558,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

[tarantool-patches] Re: [PATCH v1 1/2] Enable http_client test

[Alexander Turenko]

I'm okay with the code, but see minor comments below. LGTM formally,
please fix the comments and proceed with Kirill directly.

I would not split the patchset into two commits, just mention that
you're reverts changes made by the certain commit.

BTW, don't forget to write a cover letter when sending a patchset of
more then one patch (it is not applicable here however if you'll squash
this patchset, just reminder).

Please, use prefix 'test: ' for commits that changes only tests.

WBR, Alexander Turenko.

On Thu, Jun 06, 2019 at 03:24:54PM +0300, Alexander V. Tikhonov wrote:
> 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 link. Removed the subtest

I would be more specific: link -> symlink.

> on '595 error return' from 'error' suite, due to it may
> hang forever.
> 
> Closes #4254
> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4254-try-on-travis
> Issue: https://github.com/tarantool/tarantool/issues/4254