diff options
| author | Loïc Hoguin <[email protected]> | 2013-01-10 19:54:10 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-01-10 19:54:10 +0100 |
| commit | 9bfef7c715821ef25ca1511693a5eaaa4e4b394b (patch) | |
| tree | 627ebb023599c2ab7463261c3e02e5c518b64bd7 | |
| parent | 01f57ad65d7c75fb455f48e354bb3a328c472ce4 (diff) | |
| download | cowboy-9bfef7c715821ef25ca1511693a5eaaa4e4b394b.tar.gz cowboy-9bfef7c715821ef25ca1511693a5eaaa4e4b394b.tar.bz2 cowboy-9bfef7c715821ef25ca1511693a5eaaa4e4b394b.zip | |
Update autobahntestsuite to 0.5.2
Also small mostly insignificant changes to tests.
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | test/autobahn_SUITE_data/test.py | 6 | ||||
| -rw-r--r-- | test/http_SUITE.erl | 2 | ||||
| -rw-r--r-- | test/ws_SUITE.erl | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -59,7 +59,7 @@ tests: clean app @mkdir -p logs/ @$(CT_RUN) -suite eunit_SUITE http_SUITE ws_SUITE -autobahn: +autobahn: clean app @mkdir -p logs/ @$(CT_RUN) -suite autobahn_SUITE diff --git a/test/autobahn_SUITE_data/test.py b/test/autobahn_SUITE_data/test.py index 3cc5794..19c7669 100755 --- a/test/autobahn_SUITE_data/test.py +++ b/test/autobahn_SUITE_data/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python import os import os.path import sys @@ -10,7 +10,7 @@ AB_TESTS_PRIV = os.getenv("AB_TESTS_PRIV") VIRTUALENV_URL = 'https://raw.github.com/pypa/virtualenv/master/virtualenv.py' VIRTUALENV_BIN = os.path.join(AB_TESTS_ENV, "virtualenv.py") -PIP_BIN = os.path.join(AB_TESTS_ENV, "bin", "pip") +INSTALL_BIN = os.path.join(AB_TESTS_ENV, "bin", "easy_install") def activate_env(env): @@ -29,7 +29,7 @@ def install_env(env): subprocess.check_call(["curl", "-sS", VIRTUALENV_URL, "-o", VIRTUALENV_BIN]) subprocess.check_call(["python", VIRTUALENV_BIN, env]) activate_env(env) - subprocess.check_call([PIP_BIN, "install", "AutobahnTestSuite"]) + subprocess.check_call([INSTALL_BIN, "http://pypi.python.org/packages/2.7/a/autobahntestsuite/autobahntestsuite-0.5.2-py2.7.egg#md5=f7480d4ca6ce4954ac05f59778de4bda"]) def client_config(): """ diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl index cd4e2dc..3200188 100644 --- a/test/http_SUITE.erl +++ b/test/http_SUITE.erl @@ -982,7 +982,7 @@ stream_body_set_resp_close(Config) -> <<"stream_body_set_resp_close">> -> ok; Buffer -> - {ok, Rest} = Transport:recv(Socket, 26 - size(Buffer), 1000), + {ok, Rest} = Transport:recv(Socket, 26 - byte_size(Buffer), 1000), <<"stream_body_set_resp_close">> = << Buffer/binary, Rest/binary >>, ok end, diff --git a/test/ws_SUITE.erl b/test/ws_SUITE.erl index a2c8396..ed084d6 100644 --- a/test/ws_SUITE.erl +++ b/test/ws_SUITE.erl @@ -254,7 +254,7 @@ ws8_single_bytes(Config) -> ok = gen_tcp:send(Socket, << 16#81 >>), %% send one byte ok = timer:sleep(100), %% sleep for a period ok = gen_tcp:send(Socket, << 16#85 >>), %% send another and so on - ok = timer:sleep(100), + ok = timer:sleep(100), ok = gen_tcp:send(Socket, << 16#37 >>), ok = timer:sleep(100), ok = gen_tcp:send(Socket, << 16#fa >>), |