Merge pull request #1404 from w3c/jgraham/server_error_fixup

Fix some errors in python code that prevent tests from functioning correctly; r=Ms2ger
web-platform-tests · Nov 21, 2014 · 650fb2b · 650fb2b
2 parents 8c07290 + f286173
commit 650fb2b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/XMLHttpRequest/resources/auth1/auth.py b/XMLHttpRequest/resources/auth1/auth.py
@@ -1,9 +1,10 @@
 import imp
 import os
 
+here = os.path.split(os.path.abspath(__file__))[0]
+
 def main(request, response):
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
                                             "authentication.py"))
     return auth.main(request, response)
diff --git a/XMLHttpRequest/resources/auth2/auth.py b/XMLHttpRequest/resources/auth2/auth.py
@@ -1,9 +1,10 @@
 import imp
 import os
 
+here = os.path.split(os.path.abspath(__file__))[0]
+
 def main(request, response):
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
                                             "authentication.py"))
     return auth.main(request, response)
diff --git a/XMLHttpRequest/resources/auth3/auth.py b/XMLHttpRequest/resources/auth3/auth.py
@@ -1,9 +1,10 @@
 import imp
 import os
 
+here = os.path.split(os.path.abspath(__file__))[0]
+
 def main(request, response):
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
                                             "authentication.py"))
     return auth.main(request, response)
diff --git a/XMLHttpRequest/resources/auth4/auth.py b/XMLHttpRequest/resources/auth4/auth.py
@@ -1,9 +1,10 @@
 import imp
 import os
 
+here = os.path.split(os.path.abspath(__file__))[0]
+
 def main(request, response):
-    auth = imp.load_source("", os.path.join(os.path.abspath(os.curdir),
-                                            "XMLHttpRequest",
-                                            "resources",
+    auth = imp.load_source("", os.path.join(here,
+                                            "..",
                                             "authentication.py"))
     return auth.main(request, response)
diff --git a/progress-events/tests/submissions/Samsung/resources/no-content-length.py b/progress-events/tests/submissions/Samsung/resources/no-content-length.py
@@ -1,5 +1,5 @@
 def main(request, response):
-    response.headers.extend([('Transfer-Encoding', 'chunked'),
+    response.headers.update([('Transfer-Encoding', 'chunked'),
                              ('Content-Type', 'text/html'),
                              ('Connection', 'keep-alive')])
     response.write_status_headers()