diff options
Diffstat (limited to 'tests/runner.py')
| -rwxr-xr-x | tests/runner.py | 259 |
1 files changed, 149 insertions, 110 deletions
diff --git a/tests/runner.py b/tests/runner.py index 5a82d8f8..3a8e8751 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -12450,7 +12450,10 @@ elif 'browser' in str(sys.argv): i = sys.argv.index('browser') sys.argv = sys.argv[:i] + sys.argv[i+1:] sys.argv += [ - 'browser.test_sockets_select_server_down', + 'browser.test_sockets_echo', + 'browser.test_sockets_echo_bigdata', + 'browser.test_sockets_partial', + 'browser.test_sockets_select_server_no_accept', 'browser.test_sockets_select_server_closes_connection_rw', 'browser.test_enet' ] @@ -13994,10 +13997,10 @@ Press any key to continue.''' import signal, errno def pid_exists(pid): try: - # NOTE: may just kill the process in Windows - os.kill(pid, 0) + # NOTE: may just kill the process in Windows + os.kill(pid, 0) except OSError, e: - return e.errno == errno.EPERM + return e.errno == errno.EPERM else: return True def kill_pids(pids, sig): @@ -14016,52 +14019,35 @@ Press any key to continue.''' # extreme prejudice, may leave children kill_pids(pids, signal.SIGKILL) - # Runs a websocket server at a specific port. port is the true tcp socket we forward to, port+1 is the websocket one - class WebsockHarness: - def __init__(self, port, server_func=None, no_server=False): + class WebsockifyServerHarness: + def __init__(self, filename, args, listen_port, target_port): self.pids = [] - self.port = port - self.server_func = server_func - self.no_server = no_server + self.filename = filename + self.target_port = target_port + self.listen_port = listen_port + self.args = args or [] def __enter__(self): import socket, websockify - if not self.no_server: - def server_func(q): - q.put(None) # No sub-process to start - ssock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - ssock.bind(("127.0.0.1", self.port)) - ssock.listen(2) - while True: - csock, addr = ssock.accept() - print "Connection from %s" % repr(addr) - csock.send("te\x01\xff\x79st\x02") - - server_func = self.server_func or server_func - - server_queue = multiprocessing.Queue() - self.server = multiprocessing.Process(target=server_func, args=(server_queue,)) - self.server.start() - self.pids.append(self.server.pid) - while True: - if not server_queue.empty(): - spid = server_queue.get() - if spid: - self.pids.append(spid) - break - time.sleep(0.1) - print '[Socket server on processes %s]' % str(self.pids[-2:]) - - def websockify_func(wsp): wsp.start_server() - print >> sys.stderr, 'running websockify on %d, forward to tcp %d' % (self.port+1, self.port) - wsp = websockify.WebSocketProxy(verbose=True, listen_port=self.port+1, target_host="127.0.0.1", target_port=self.port, run_once=True) - self.websockify = multiprocessing.Process(target=websockify_func, args=(wsp,)) + # compile the server + # NOTE empty filename support is a hack to support + # the current test_enet + if self.filename: + Popen([CLANG_CC, path_from_root('tests', self.filename), '-o', 'server'] + self.args).communicate() + process = Popen(['./server']) + self.pids.append(process.pid) + + # start the websocket proxy + print >> sys.stderr, 'running websockify on %d, forward to tcp %d' % (self.listen_port, self.target_port) + wsp = websockify.WebSocketProxy(verbose=True, listen_port=self.listen_port, target_host="127.0.0.1", target_port=self.target_port, run_once=True) + self.websockify = multiprocessing.Process(target=wsp.start_server) self.websockify.start() self.pids.append(self.websockify.pid) print '[Websockify on process %s]' % str(self.pids[-2:]) def __exit__(self, *args, **kwargs): + # try to kill the websockify proxy gracefully if self.websockify.is_alive(): self.websockify.terminate() self.websockify.join() @@ -14069,83 +14055,102 @@ Press any key to continue.''' # clean up any processes we started browser.clean_pids(self.pids) + + class CompiledServerHarness: + def __init__(self, filename, args): + self.pids = browser.PidContainer() + self.filename = filename + self.args = args or [] + + def __enter__(self): + import socket, websockify + + # compile the server + Popen([PYTHON, EMCC, path_from_root('tests', self.filename), '-o', 'server.js'] + self.args).communicate() + process = Popen([NODE_JS, 'server.js']) + self.pids.append(process.pid) + + def __exit__(self, *args, **kwargs): + # clean up any processes we started + self.pids.kill_all() + + def make_relay_server(self, port1, port2): + print >> sys.stderr, 'creating relay server on ports %d,%d' % (port1, port2) + proc = Popen([PYTHON, path_from_root('tests', 'sockets/socket_relay.py'), str(port1), str(port2)]) + return proc + # always run these tests last # make sure to use different ports in each one because it takes a while for the processes to be cleaned up - def test_sockets_partial(self): - def partial(q): - import socket - - q.put(None) # No sub-process to start - ssock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - ssock.bind(("127.0.0.1", 8990)) - ssock.listen(2) - while True: - csock, addr = ssock.accept() - print "Connection from %s" % repr(addr) - csock.send("\x09\x01\x02\x03\x04\x05\x06\x07\x08\x09") - csock.send("\x08\x01\x02\x03\x04\x05\x06\x07\x08") - csock.send("\x07\x01\x02\x03\x04\x05\x06\x07") - csock.send("\x06\x01\x02\x03\x04\x05\x06") - csock.send("\x05\x01\x02\x03\x04\x05") - csock.send("\x04\x01\x02\x03\x04") - csock.send("\x03\x01\x02\x03") - csock.send("\x02\x01\x02") - csock.send("\x01\x01") - - with self.WebsockHarness(8990, partial): - self.btest('sockets/test_sockets_partial.c', expected='165', args=['-DSOCKK=8991']) - def make_relay_server(self, port1, port2): - def relay_server(q): - print >> sys.stderr, 'creating relay server on ports %d,%d' % (port1, port2) - proc = Popen([PYTHON, path_from_root('tests', 'sockets/socket_relay.py'), str(port1), str(port2)]) - q.put(proc.pid) - proc.communicate() - return relay_server + # NOTE all datagram tests are temporarily disabled, as + # we can't truly test datagram sockets until we have + # proper listen server support. + + def test_sockets_echo(self): + sockets_include = '-I'+path_from_root('tests/sockets') + + for datagram in [0]: + dgram_define = '-DTEST_DGRAM=%d' % datagram + + for harness in [ + self.WebsockifyServerHarness('sockets/test_sockets_echo_server.c', ['-DSOCKK=8990', dgram_define, sockets_include], 8991, 8990) + # self.CompiledServerHarness('sockets/test_sockets_echo_server.c', ['-DSOCKK=8990', dgram_define, sockets_include]) + ]: + with harness: + self.btest('sockets/test_sockets_echo_client.c', expected='0', args=['-DSOCKK=8991', dgram_define, sockets_include]) + + def test_sockets_echo_bigdata(self): + sockets_include = '-I'+path_from_root('tests/sockets') + + for datagram in [0]: + dgram_define = '-DTEST_DGRAM=%d' % datagram + + # generate a large string literal to use as our message + message = '' + for i in range(256*256*2): + message += str(unichr(ord('a') + (i % 26))) + + # re-write the client test with this literal (it's too big to pass via command line) + input_filename = path_from_root('tests/sockets', 'test_sockets_echo_client.c') + input = open(input_filename).read() + output = input.replace('#define MESSAGE "pingtothepong"', '#define MESSAGE "%s"' % message) + + for harness in [ + self.WebsockifyServerHarness('sockets/test_sockets_echo_server.c', ['-DSOCKK=8992', dgram_define, sockets_include], 8993, 8992) + ]: + with harness: + self.btest(output, expected='0', args=['-DSOCKK=8993', dgram_define, sockets_include], force_c=True) + + def test_sockets_partial(self): + for harness in [ + self.WebsockifyServerHarness('sockets/test_sockets_partial_server.c', ['-DSOCKK=8994'], 8995, 8994) + ]: + with harness: + self.btest('sockets/test_sockets_partial_client.c', expected='165', args=['-DSOCKK=8995']) # TODO add support for gethostbyaddr to re-enable this test # def test_sockets_gethostbyname(self): # self.btest('sockets/test_sockets_gethostbyname.c', expected='0', args=['-O2', '-DSOCKK=8997']) - - def test_sockets_select_server_down(self): - def closedServer(q): - import socket - q.put(None) # No sub-process to start - ssock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - ssock.bind(("127.0.0.1", 8994)) - with self.WebsockHarness(8994, closedServer): - self.btest('sockets/test_sockets_select.c', expected='266', args=['-DSOCKK=8995']) + def test_sockets_select_server_no_accept(self): + for harness in [ + self.WebsockifyServerHarness('sockets/test_sockets_select_server_no_accept_server.c', ['-DSOCKK=8995'], 8996, 8995) + ]: + self.btest('sockets/test_sockets_select_server_no_accept_client.c', expected='266', args=['-DSOCKK=8996']) def test_sockets_select_server_closes_connection_rw(self): - def closingServer_rw(q): - import socket - - q.put(None) # No sub-process to start - ssock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - ssock.bind(("127.0.0.1", 8998)) - ssock.listen(2) - while True: - csock, addr = ssock.accept() - print "Connection from %s" % repr(addr) - readArray = bytearray(10) - #readBuffer = buffer(readArray) - bytesRead = 0 - # Let the client start to write data - while (bytesRead < 10): - (readBytes, address) = csock.recvfrom_into( readArray, 10 ) - bytesRead += readBytes - print "server: 10 bytes read" - # Now we write a message on our own ... - csock.send("0123456789") - print "server: 10 bytes written" - # And immediately close the connection - csock.close() - print "server: connection closed" - - with self.WebsockHarness(8998, closingServer_rw): - self.btest('sockets/test_sockets_select_server_closes_connection_rw.c', expected='266', args=['-DSOCKK=8999']) + sockets_include = '-I'+path_from_root('tests/sockets') + for harness in [ + self.WebsockifyServerHarness('sockets/test_sockets_echo_server.c', ['-DSOCKK=9004', sockets_include], 9005, 9004) + ]: + with harness: + self.btest('sockets/test_sockets_select_server_closes_connection_client_rw.c', expected='266', args=['-DSOCKK=9005', sockets_include]) + + # TODO remove this once we have proper listen server support built into emscripten. + # being that enet uses datagram sockets, we can't proxy to a native server with + # websockify, so we're emulating the listen server in the browser and relaying + # between two TCP servers. def test_enet(self): try_delete(self.in_dir('enet')) shutil.copytree(path_from_root('tests', 'enet'), self.in_dir('enet')) @@ -14155,11 +14160,45 @@ Press any key to continue.''' Popen([PYTHON, path_from_root('emmake'), 'make']).communicate() enet = [self.in_dir('enet', '.libs', 'libenet.a'), '-I'+path_from_root('tests', 'enet', 'include')] os.chdir(pwd) - Popen([PYTHON, EMCC, path_from_root('tests', 'sockets/test_enet_server.c'), '-o', 'server.html', '-DSOCKK=1235'] + enet).communicate() + Popen([PYTHON, EMCC, path_from_root('tests/sockets', 'test_enet_server.c'), '-o', 'server.html', '-DSOCKK=2235'] + enet).communicate() - with self.WebsockHarness(1234, self.make_relay_server(1234, 1236)): - with self.WebsockHarness(1236, no_server=True): - self.btest('sockets/test_enet_client.c', expected='0', args=['-DSOCKK=1237'] + enet) + with self.WebsockifyServerHarness('', [], 2235, 2234): + with self.WebsockifyServerHarness('', [], 2237, 2236): + pids = [] + try: + proc = self.make_relay_server(2234, 2236) + pids.append(proc.pid) + self.btest('sockets/test_enet_client.c', expected='0', args=['-DSOCKK=2237'] + enet) + finally: + browser.clean_pids(pids); + + # TODO use this once we have listen server support + # def test_enet(self): + # # build a native version of the enet lib + # try_delete(self.in_dir('enet_native')) + # shutil.copytree(path_from_root('tests', 'enet'), self.in_dir('enet_native')) + # pwd = os.getcwd() + # os.chdir(self.in_dir('enet_native')) + # Popen(['./configure']).communicate() + # Popen(['make']).communicate() + # enet_native = [self.in_dir('enet_native', '.libs', 'libenet.a'), '-I'+path_from_root('tests', 'enet', 'include')] + # os.chdir(pwd) + + # # build a transpiled version of enet lib + # try_delete(self.in_dir('enet_emscripten')) + # shutil.copytree(path_from_root('tests', 'enet'), self.in_dir('enet_emscripten')) + # pwd = os.getcwd() + # os.chdir(self.in_dir('enet_emscripten')) + # Popen([PYTHON, path_from_root('emconfigure'), './configure']).communicate() + # Popen([PYTHON, path_from_root('emmake'), 'make']).communicate() + # enet_emscripten = [self.in_dir('enet_emscripten', '.libs', 'libenet.a'), '-I'+path_from_root('tests', 'enet', 'include')] + # os.chdir(pwd) + + # for harness in [ + # self.CompiledServerHarness('sockets/test_enet_server.c', ['-DSOCKK=9010'] + enet_native, 9011, 9010) + # ]: + # with harness: + # self.btest('sockets/test_enet_client.c', expected='0', args=['-DSOCKK=9011'] + enet_emscripten) elif 'benchmark' in str(sys.argv): # Benchmarks. Run them with argument |benchmark|. To run a specific test, do |