aboutsummaryrefslogtreecommitdiff
path: root/tests/runner.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/runner.py')
-rwxr-xr-xtests/runner.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/runner.py b/tests/runner.py
index f24756f6..f07e0991 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -15,7 +15,6 @@ will use 4 processes. To install nose do something like
from subprocess import Popen, PIPE, STDOUT
import os, unittest, tempfile, shutil, time, inspect, sys, math, glob, tempfile, re, difflib, webbrowser, hashlib, threading, platform, BaseHTTPServer, multiprocessing, functools, stat
-
if len(sys.argv) == 1:
print '''
==============================================================================
@@ -8155,6 +8154,12 @@ fscanfed: 10 - hello
elif 'browser' in str(sys.argv):
# Browser tests.
+ ''' Enable this code to run in another browser than webbrowser detects as default
+ def run_in_other_browser(url):
+ execute(['yourbrowser', url])
+ webbrowser.open_new = run_in_other_browser
+ '''
+
print
print 'Running the browser tests. Make sure the browser allows popups from localhost.'
print
@@ -9358,7 +9363,7 @@ elif 'browser' in str(sys.argv):
finally:
self.clean_pids()
- def zzztest_zz_enet(self):
+ def test_zz_enet(self):
try_delete(self.in_dir('enet'))
shutil.copytree(path_from_root('tests', 'enet'), self.in_dir('enet'))
pwd = os.getcwd()
@@ -9367,12 +9372,12 @@ elif 'browser' in str(sys.argv):
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', 'enet_server.c'), '-o', 'server.html', '-s', 'SOCKET_DEBUG=1'] + enet).communicate()
+ Popen(['python', EMCC, path_from_root('tests', 'enet_server.c'), '-o', 'server.html'] + enet).communicate()
try:
with self.WebsockHarness(1234, self.make_relay_server(1234, 1236)):
with self.WebsockHarness(1236, no_server=True):
- self.btest('enet_client.c', expected='cheez', args=enet+['-s', 'SOCKET_DEBUG=1'])
+ self.btest('enet_client.c', expected='0', args=enet)
finally:
self.clean_pids()