Changeset 100592 in webkit

Timestamp:

Nov 17, 2011 3:01:53 AM (12 years ago)

Author:

abarth@webkit.org

Message:

Move test_results_uploader.py out of layout_package
​https://bugs.webkit.org/show_bug.cgi?id=72590

Reviewed by Eric Seidel.

Most of the lines of code in this file are wrong, but I've restrained
myself and only changed a few of them to generalized this class to the
common package.

This is part of a series of patches to remove layout_package.

• Scripts/webkitpy/common/net/file_uploader.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py.
• Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
• Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py: Removed.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/file_uploader.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py) (4 diffs)
• Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-17  Adam Barth  <abarth@webkit.org>
+
+        Move test_results_uploader.py out of layout_package
+        https://bugs.webkit.org/show_bug.cgi?id=72590
+
+        Reviewed by Eric Seidel.
+
+        Most of the lines of code in this file are wrong, but I've restrained
+        myself and only changed a few of them to generalized this class to the
+        common package.
+
+        This is part of a series of patches to remove layout_package.
+
+        * Scripts/webkitpy/common/net/file_uploader.py: Copied from Tools/Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py.
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+        * Scripts/webkitpy/layout_tests/layout_package/test_results_uploader.py: Removed.
+
 2011-11-17  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/net/file_uploader.py

@@ -37 +37 @@
 from webkitpy.common.net.networktransaction import NetworkTransaction
 
+
 def get_mime_type(filename):
     return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
 
 
+# FIXME: Rather than taking tuples, this function should take more structured data.
 def _encode_multipart_form_data(fields, files):
     """Encode form fields for multipart/form-data.
@@ -82 +84 @@
 
 
-class TestResultsUploader:
-    def __init__(self, host):
-        self._host = host
+class FileUploader(object):
+    def __init__(self, url):
+        self._url = url
 
     def _upload_files(self, attrs, file_objs):
-        url = "http://%s/testfile/upload" % self._host
+        # FIXME: We should use the same variable names for the formal and actual parameters.
         content_type, data = _encode_multipart_form_data(attrs, file_objs)
-        headers = {"Content-Type": content_type}
-        request = urllib2.Request(url, data, headers)
+        headers = {
+            "Content-Type": content_type,
+        }
+        # FIXME: We should talk to the network via a Host object.
+        request = urllib2.Request(self._url, data, headers)
         urllib2.urlopen(request)
 
@@ -96 +101 @@
         file_objs = []
         for filename, path in files:
+            # FIXME: We should talk to the filesytem via a Host object.
             with codecs.open(path, "rb") as file:
                 file_objs.append(('file', filename, file.read()))
@@ -101 +107 @@
         orig_timeout = socket.getdefaulttimeout()
         try:
+            # FIXME: We shouldn't mutate global static state.
             socket.setdefaulttimeout(timeout_seconds)
             NetworkTransaction(timeout_seconds=timeout_seconds).run(

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py

@@ -35 +35 @@
 import xml.dom.minidom
 
-from webkitpy.layout_tests.layout_package import test_results_uploader
+from webkitpy.common.net.file_uploader import FileUploader
 
 try:
@@ -318 +318 @@
             for file in json_files]
 
-        uploader = test_results_uploader.TestResultsUploader(
-            self._test_results_server)
+        url = "http://%s/testfile/upload" % self._test_results_server
+        uploader = FileUploader(url)
         try:
             # Set uploading timeout in case appengine server is having problem.
@@ -419 +419 @@
 
         try:
+            # FIXME: We should talk to the network via a Host object.
             results_file = urllib2.urlopen(results_file_url)
             info = results_file.info()