Bug 1404708 - Fix XHR tests to load correct resources, r=jdm

MozReview-Commit-ID: 3JtC20N4b5H

--HG--
extra : rebase_source : f5024988f95f8ad069f795ac818e2853a18bc6d0

testing/web-platform/meta/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm.ini

@@ -1,5 +0,0 @@
-[send-authentication-cors-basic-setrequestheader.htm]
-  type: testharness
-  [XMLHttpRequest: send() - "Basic" authenticated CORS request using setRequestHeader() (expects to succeed)]
-    expected: FAIL
-

testing/web-platform/meta/XMLHttpRequest/send-authentication-cors-setrequestheader-no-cred.htm.ini

@@ -1,5 +0,0 @@
-[send-authentication-cors-setrequestheader-no-cred.htm]
-  type: testharness
-  [CORS request with setRequestHeader auth to URL accepting Authorization header]
-    expected: FAIL
-

testing/web-platform/tests/XMLHttpRequest/resources/auth2/corsenabled.py

@@ -1,13 +1,16 @@
 import imp
 import os
 
+here = os.path.dirname(__file__)
+
+
 def main(request, response):
     response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
     response.headers.set('Access-Control-Allow-Credentials', 'true');
     response.headers.set('Access-Control-Allow-Methods', 'GET');
     response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass');
     response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
-    auth = imp.load_source("", os.path.abspath("XMLHttpRequest/resources/authentication.py"))
+    auth = imp.load_source("", os.path.abspath(os.path.join(here, os.pardir, "authentication.py")))
     if request.method == "OPTIONS":
         return ""
     else:

testing/web-platform/tests/XMLHttpRequest/resources/auth7/corsenabled.py

@@ -1,15 +1,16 @@
 import imp
 import os
 
+here = os.path.dirname(__file__)
+
 def main(request, response):
     response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
     response.headers.set('Access-Control-Allow-Credentials', 'true');
     response.headers.set('Access-Control-Allow-Methods', 'GET');
     response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass');
     response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            os.pardir,
                                             "authentication.py"))
     if request.method == "OPTIONS":
         return ""

testing/web-platform/tests/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py

@@ -1,15 +1,17 @@
 import imp
 import os
 
+here = os.path.dirname(__file__)
+
+
 def main(request, response):
     response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
     response.headers.set('Access-Control-Allow-Credentials', 'true');
     response.headers.set('Access-Control-Allow-Methods', 'GET');
     response.headers.set('Access-Control-Allow-Headers', 'x-user, x-pass');
     response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            os.pardir,
                                             "authentication.py"))
     if request.method == "OPTIONS":
         return ""