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

Alexander Turenko alexander.turenko at tarantool.org
Thu Jun 13 19:56:02 MSK 2019


On Thu, Jun 13, 2019 at 01:18:40PM +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 symlink, added python2
> existence checker to avoid of brew failures, like on
> OSX 10.13 Sierra met. Removed the subtest on '595 error
> return' from 'error' suite, due to it may hang forever.
> 
> Closes #4254

Cherry-picked from? Based on commit(s)?

> ---
> 
> Github: https://github.com/tarantool/tarantool/tree/avtikhon/1.10_gh-4254-http_client
> Issue: https://github.com/tarantool/tarantool/issues/4254
> 
>  .travis.mk                        | 3 ++-
>  test/app-tap/http_client.skipcond | 7 -------
>  test/app-tap/http_client.test.lua | 3 +--
>  3 files changed, 3 insertions(+), 10 deletions(-)
>  delete mode 100644 test/app-tap/http_client.skipcond
> 
> diff --git a/.travis.mk b/.travis.mk
> index 39cda1d63..819aa94ae 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -50,6 +50,7 @@ test_ubuntu: deps_ubuntu
>  deps_osx:
>  	brew update
>  	brew install openssl readline curl icu4c --force
> +	python2 -V || brew install python2 --force
>  	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python
>  	pip install -r test-run/requirements.txt
>  
> @@ -62,7 +63,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 3e0689ddf..9c53b6928 100755
> --- a/test/app-tap/http_client.test.lua
> +++ b/test/app-tap/http_client.test.lua
> @@ -223,7 +223,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),
> @@ -234,7 +234,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")

Here you still do the request that was cause the problem (I mean
http:get(<...>)).

>  end
>  
>  -- gh-3679 allow only headers can be converted to string
> -- 
> 2.17.1
> 




More information about the Tarantool-patches mailing list