Просмотр исходного кода

Update autobahntestsuite to 0.5.2

Also small mostly insignificant changes to tests.
Loïc Hoguin 12 лет назад
Родитель
Сommit
9bfef7c715
4 измененных файлов с 6 добавлено и 6 удалено
  1. 1 1
      Makefile
  2. 3 3
      test/autobahn_SUITE_data/test.py
  3. 1 1
      test/http_SUITE.erl
  4. 1 1
      test/ws_SUITE.erl

+ 1 - 1
Makefile

@@ -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
 

+ 3 - 3
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():
     """

+ 1 - 1
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,

+ 1 - 1
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 >>),