Test directory reorganization.

The `certs`, `fixtures`, `node_modules`, and `www` directories, and
`testharness.js`, are moved into a new `lib` directory to reduce
clutter; the long-term plan is that all other subdirectories will
contain tests.  (Right now, we still have `ghostdriver-tests` as an
exception.)  Adjust `writing-tests.md`, `run-tests.py`, `testharness.js`,
and a couple of tests accordingly.

Also fix a bug in `run-tests.py` where ERROR conditions that happened
before the first test were not being reported accurately.

test/lib/testharness.js

@@ -1461,6 +1461,13 @@ if (args.test_script === "") {
     // process_command_line has already issued an error message.
     phantom.exit(2);
 } else {
+    // run-tests.py sets this environment variable to the root of the
+    // test directory.
+    expose(sys.env['TEST_DIR'], 'TEST_DIR');
+
+    // The JS modules in TEST_DIR/lib/node_modules are always available.
+    require.paths.push(fs.join(sys.env['TEST_DIR'], 'lib', 'node_modules'));
+
     // Reset the library paths for injectJs and require to the
     // directory containing the test script, so relative imports work
     // as expected.  Unfortunately, phantom.libraryPath is not a

test/module/webpage/capture-content.js

@@ -1,9 +1,7 @@
 var content;
 setup(function () {
     var fs = require('fs');
-    // libraryPath is test/module/webpage
-    content = fs.read(fs.join(phantom.libraryPath,
-                              "../../www/hello.html"));
+    content = fs.read(fs.join(TEST_DIR, "lib/www/hello.html"));
 });
 
 // XFAIL: This feature had to be backed out for breaking WebSockets.

test/module/webpage/on-error.js

@@ -1,4 +1,5 @@
 var webpage = require('webpage');
+var fs = require('fs');
 
 test(function () {
     var page = webpage.create();
@@ -66,6 +67,9 @@ test(function () {
     assert_is_true(page.evaluate(function() { return window.caughtError; }));
 }, "should not report errors that were caught");
 
+var helperBase = "error-helper.js";
+var helperFile = fs.join(TEST_DIR, "lib", "fixtures", helperBase);
+
 function check_stack(message, stack) {
     assert_equals(message,
                   "ReferenceError: Can't find variable: referenceError");
@@ -85,11 +89,8 @@ function check_stack(message, stack) {
     }
 }
 
-var helperBase = "error-helper.js";
-var helperFile = "../../fixtures/" + helperBase;
-assert_is_true(phantom.injectJs(helperFile));
-
 test(function () {
+    assert_is_true(phantom.injectJs(helperFile));
     try {
         ErrorHelper.foo();
     } catch (e) {
@@ -99,7 +100,6 @@ test(function () {
 
 async_test(function () {
     var page = webpage.create();
-    page.libraryPath = phantom.libraryPath;
     assert_is_true(page.injectJs(helperFile));
 
     page.onError = this.step_func_done(check_stack);

test/regression/pjs-13551.js

@@ -6,7 +6,7 @@ var webpage = require('webpage');
 function test_template(parent, action) {
     var page;
     var url = TEST_HTTP_BASE +
-              "/regression/pjs-13551/" + parent + "-parent.html";
+              "regression/pjs-13551/" + parent + "-parent.html";
     var s_callback0, s_callback1, s_callback2;
 
     function callback0 (n) {

test/run-tests.py

@@ -109,8 +109,8 @@ CIPHERLIST_2_7_9 = (
     '!eNULL:!MD5:!DSS:!RC4'
 )
 def wrap_socket_ssl(sock, base_path):
-    crtfile = os.path.join(base_path, 'certs/https-snakeoil.crt')
-    keyfile = os.path.join(base_path, 'certs/https-snakeoil.key')
+    crtfile = os.path.join(base_path, 'lib/certs/https-snakeoil.crt')
+    keyfile = os.path.join(base_path, 'lib/certs/https-snakeoil.key')
 
     try:
         ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
@@ -367,7 +367,7 @@ class HTTPTestServer(object):
         self.httpd        = None
         self.httpsd       = None
         self.base_path    = base_path
-        self.www_path     = os.path.join(base_path, 'www')
+        self.www_path     = os.path.join(base_path, 'lib/www')
         self.signal_error = signal_error
         self.verbose      = verbose
 
@@ -669,6 +669,13 @@ class TAPTestGroup(TestGroup):
                 self.add_skip(out[(i+1):], "All further output ignored")
             return
 
+        if any(msg.startswith("ERROR:") for msg in messages):
+            self.add_error(messages, "Before tests")
+            messages = []
+        elif messages:
+            self.add_error(messages, "Stray diagnostic")
+            messages = []
+
         prev_point = 0
 
         for i in range(i+1, len(out)):
@@ -743,8 +750,8 @@ class TAPTestGroup(TestGroup):
 class TestRunner(object):
     def __init__(self, base_path, phantomjs_exe, options):
         self.base_path       = base_path
-        self.cert_path       = os.path.join(base_path, 'certs')
-        self.harness         = os.path.join(base_path, 'testharness.js')
+        self.cert_path       = os.path.join(base_path, 'lib/certs')
+        self.harness         = os.path.join(base_path, 'lib/testharness.js')
         self.phantomjs_exe   = phantomjs_exe
         self.verbose         = options.verbose
         self.debugger        = options.debugger
@@ -960,6 +967,8 @@ class TestRunner(object):
 
 def init():
     base_path = os.path.normpath(os.path.dirname(os.path.abspath(__file__)))
+    os.environ["TEST_DIR"] = base_path
+
     phantomjs_exe = os.path.normpath(base_path + '/../bin/phantomjs')
     if sys.platform in ('win32', 'cygwin'):
         phantomjs_exe += '.exe'
@@ -1009,6 +1018,15 @@ def init():
     # usually written, e.g. UTC+1 would be xxx-1:00.
     os.environ["TZ"] = "CIST-12:45:00"
 
+    # Run all the tests in the "C" locale.  (A UTF-8-based locale
+    # which is thoroughly different from "C" would flush out more
+    # bugs, but we have no way of knowing if such a locale exists.)
+    for var in list(os.environ.keys()):
+        if var[:3] == 'LC_' or var[:4] == 'LANG':
+            del os.environ[var]
+
+    os.environ["LANG"] = "C"
+
     return runner
 
 def main():

test/writing-tests.md

@@ -8,11 +8,11 @@ of test subdirectories is in
 [the `TESTS` variable in `run-tests.py`](run-tests.py#L26).)
 
 In addition to all of the usual PhantomJS API, these scripts have
-access to a special testing API, loosely based on
-[W3C testharness.js](https://github.com/w3c/testharness.js) and
-defined in [`testharness.js`](testharness.js) in this directory.  They
-also have access to HTTP and HTTPS servers on `localhost`, which serve
-the files in the [`www`](www) directory.
+access to a special testing API, loosely based on [W3C
+testharness.js](https://github.com/w3c/testharness.js) and defined
+in [`lib/testharness.js`](lib/testharness.js).  They also have
+access to HTTP and HTTPS servers on `localhost`, which serve the
+files in the [`lib/www`](lib/www) directory.
 
 ## The Structure of Test Scripts
 
@@ -561,20 +561,20 @@ respective streams.
 
 ## Test Server Modules
 
-The HTTP and HTTPS servers exposed to the test suite serve the static
-files in the `www` subdirectory with URLs corresponding to their paths
-relative to that directory.  If you need more complicated server
-behavior than that, you can write custom Python code that executes
-when the server receives a request.  Any `.py` file below the `www`
-directory will be invoked to provide the response for that path
-*without* the `.py` suffix.  (For instance, `www/echo.py` provides
-responses for `TEST_HTTP_BASE + 'echo'`.)  Such files must define a
-top-level function named `handle_request`.  This function receives a
-single argument, which is an instance of a subclass of
+The HTTP and HTTPS servers exposed to the test suite serve the
+static files in the `lib/www` subdirectory, with URLs corresponding
+to their paths relative to that directory.  If you need more
+complicated server behavior than that, you can write custom Python
+code that executes when the server receives a request.  Any `.py`
+file below `lib/www` will be invoked to provide the response for
+that path *without* the `.py` suffix.  (For instance, `lib/www/echo.py`
+provides responses for `TEST_HTTP_BASE + 'echo'`.)  Such files must
+define a top-level function named `handle_request`.  This function
+receives a single argument, which is an instance of a subclass of
 [`BaseHTTPServer.BaseHTTPRequestHandler`](https://docs.python.org/2/library/basehttpserver.html#BaseHTTPServer.BaseHTTPRequestHandler).
 The request headers and body (if any) may be retrieved from this
-object.  The function must use the `send_response`, `send_header`, and
-`end_headers` methods of this object to generate HTTP response
+object.  The function must use the `send_response`, `send_header`,
+and `end_headers` methods of this object to generate HTTP response
 headers, and then return a *file-like object* (**not** a string)
 containing the response body.  The function is responsible for
 generating appropriate `Content-Type` and `Content-Length` headers;