Move casper server.log into casper_tests/.

This commit is contained in:
Tim Abbott 2015-10-13 17:58:50 -04:00
parent 988a9acead
commit 2294063361
2 changed files with 3 additions and 3 deletions

View File

@ -41,7 +41,7 @@ subprocess.check_call('tools/generate-test-credentials')
subprocess.check_call(['rm', '-f'] + glob.glob('/tmp/casper-failure*.png')) subprocess.check_call(['rm', '-f'] + glob.glob('/tmp/casper-failure*.png'))
log = open('frontend_tests/server.log', 'w') log = open('frontend_tests/casper_tests/server.log', 'w')
# Run this not through the shell, so that we have the actual PID. # Run this not through the shell, so that we have the actual PID.
server = subprocess.Popen(('tools/run-dev.py', '--test'), server = subprocess.Popen(('tools/run-dev.py', '--test'),
@ -50,7 +50,7 @@ server = subprocess.Popen(('tools/run-dev.py', '--test'),
def assert_server_running(): def assert_server_running():
# Get the exit code of the server, or None if it is still running. # Get the exit code of the server, or None if it is still running.
if server.poll() is not None: if server.poll() is not None:
raise RuntimeError, 'Server died unexpectedly! Check frontend_tests/server.log' raise RuntimeError, 'Server died unexpectedly! Check frontend_tests/casper_tests/server.log'
def server_is_up(): def server_is_up():
assert_server_running() assert_server_running()
@ -89,7 +89,7 @@ finally:
if ret != 0: if ret != 0:
print >>sys.stderr, """ print >>sys.stderr, """
Oops, the frontend tests failed. Tips for debugging: Oops, the frontend tests failed. Tips for debugging:
* Check the frontend test server logs at frontend_tests/server.log * Check the frontend test server logs at frontend_tests/casper_tests/server.log
* Check the screenshots of failed tests at /tmp/casper-failure*.png * Check the screenshots of failed tests at /tmp/casper-failure*.png
* Try remote debugging the test web browser as described in docs/testing.rst * Try remote debugging the test web browser as described in docs/testing.rst
""" """