aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-08-30 11:32:01 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-08-30 11:32:01 -0700
commita9029e02d342122375629a9d2153d43c626d41dd (patch)
tree3bef4765c36d615bd2eb1efe04d4c00fa0cfa955 /tests
parent699cb8afd2beb156f59a1e7a4122a3876d7ec36a (diff)
fix use of NODE_JS in test_sockets
Diffstat (limited to 'tests')
-rw-r--r--tests/test_sockets.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/test_sockets.py b/tests/test_sockets.py
index b2116e21..eacd92ba 100644
--- a/tests/test_sockets.py
+++ b/tests/test_sockets.py
@@ -80,13 +80,13 @@ class CompiledServerHarness:
def __enter__(self):
# assuming this is only used for WebSocket tests at the moment, validate that
# the ws module is installed
- child = Popen([NODE_JS, '-e', 'require("ws");'])
+ child = Popen(listify(NODE_JS) + ['-e', 'require("ws");'])
child.communicate()
assert child.returncode == 0, 'ws module for Node.js not installed. Please run \'npm install\' from %s' % EMSCRIPTEN_ROOT
# compile the server
Popen([PYTHON, EMCC, path_from_root('tests', self.filename), '-o', 'server.js', '-DSOCKK=%d' % self.listen_port] + self.args).communicate()
- process = Popen([NODE_JS, 'server.js'])
+ process = Popen(listify(NODE_JS) + ['server.js'])
self.pids.append(process.pid)
def __exit__(self, *args, **kwargs):
@@ -398,4 +398,5 @@ class sockets(BrowserCore):
Popen([PYTHON, EMCC, temp_peer_filepath, '-o', peer_outfile] + ['-s', 'GL_TESTING=1', '--pre-js', 'peer_pre.js', '-s', 'SOCKET_WEBRTC=1', '-s', 'SOCKET_DEBUG=1']).communicate()
expected = '1'
- self.run_browser(host_outfile, '.', ['/report_result?' + e for e in expected]) \ No newline at end of file
+ self.run_browser(host_outfile, '.', ['/report_result?' + e for e in expected])
+