Changeset 70103 in webkit

Timestamp:

Oct 19, 2010 4:02:49 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-10-19 Eric Seidel <​eric@webkit.org>

Unreviewed, just fixing test-webkitpy. I'm really on a roll today.

commit-queue gets stuck when release-patch returns 404
​https://bugs.webkit.org/show_bug.cgi?id=47935

Fix test-webkitpy and unittest NetworkTransaction.

• Scripts/webkitpy/common/net/networktransaction.py:
• Scripts/webkitpy/common/net/networktransaction_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/net/networktransaction.py (modified) (2 diffs)
• Scripts/webkitpy/common/net/networktransaction_unittest.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-19  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed, just fixing test-webkitpy.  I'm really on a roll today.
+
+        commit-queue gets stuck when release-patch returns 404
+        https://bugs.webkit.org/show_bug.cgi?id=47935
+
+        Fix test-webkitpy and unittest NetworkTransaction.
+
+        * Scripts/webkitpy/common/net/networktransaction.py:
+        * Scripts/webkitpy/common/net/networktransaction_unittest.py:
+
 2010-10-19  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/net/networktransaction.py

@@ -46 +46 @@
         self._grown_factor = grown_factor
         self._timeout_seconds = timeout_seconds
+        self._convert_404_to_None = convert_404_to_None
 
     def run(self, request):
@@ -55 +56 @@
             # FIXME: We should catch urllib2.HTTPError here too.
             except mechanize.HTTPError, e:
-                if convert_404_to_None and e.code == 404:
+                if self._convert_404_to_None and e.code == 404:
                     return None
                 self._check_for_timeout()

trunk/WebKitTools/Scripts/webkitpy/common/net/networktransaction_unittest.py

@@ -57 +57 @@
         self.assertTrue(did_process_exception)
 
-    def _raise_http_error(self):
+    def _raise_500_error(self):
         self._run_count += 1
         if self._run_count < 3:
-            raise HTTPError("http://example.com/", 500, "inteneral server error", None, None)
+            raise HTTPError("http://example.com/", 500, "internal server error", None, None)
         return 42
+
+    def _raise_404_error(self):
+        raise HTTPError("http://foo.com/", 404, "not found", None, None)
 
     def test_retry(self):
         self._run_count = 0
         transaction = NetworkTransaction(initial_backoff_seconds=0)
-        self.assertEqual(transaction.run(lambda: self._raise_http_error()), 42)
+        self.assertEqual(transaction.run(lambda: self._raise_500_error()), 42)
         self.assertEqual(self._run_count, 3)
         self.assertLog(['WARNING: Received HTTP status 500 from server.  '
@@ -72 +75 @@
                         'WARNING: Received HTTP status 500 from server.  '
                         'Retrying in 0.0 seconds...\n'])
+
+    def test_convert_404_to_None(self):
+        transaction = NetworkTransaction(convert_404_to_None=True)
+        self.assertEqual(transaction.run(lambda: self._raise_404_error()), None)
 
     def test_timeout(self):
@@ -79 +86 @@
         did_throw_exception = True
         try:
-            transaction.run(lambda: self._raise_http_error())
+            transaction.run(lambda: self._raise_500_error())
             did_throw_exception = False
         except NetworkTimeout, e: