Bug 1404708 - Fix XHR tests to load correct resources, r=jdm
MozReview-Commit-ID: 3JtC20N4b5H
deleted file mode 100644
--- a/testing/web-platform/meta/XMLHttpRequest/send-authentication-cors-basic-setrequestheader.htm.ini
+++ /dev/null
@@ -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
-
--- a/testing/web-platform/tests/XMLHttpRequest/resources/auth2/corsenabled.py
+++ b/testing/web-platform/tests/XMLHttpRequest/resources/auth2/corsenabled.py
@@ -1,14 +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', '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:
return auth.main(request, response)
--- a/testing/web-platform/tests/XMLHttpRequest/resources/auth7/corsenabled.py
+++ b/testing/web-platform/tests/XMLHttpRequest/resources/auth7/corsenabled.py
@@ -1,20 +1,21 @@
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(__file__,
+ os.pardir,
"authentication.py"))
if request.method == "OPTIONS":
return ""
else:
return auth.main(request, response)
--- a/testing/web-platform/tests/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py
+++ b/testing/web-platform/tests/XMLHttpRequest/resources/auth8/corsenabled-no-authorize.py
@@ -1,20 +1,22 @@
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 ""
else:
return auth.main(request, response)