[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a245a63024d3a8167a31c37338ba7eeb2c2c1bc8
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 05:32:26 2011 +0000

    2011-01-06  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            NetworkTransaction should log the url it is retrying
            https://bugs.webkit.org/show_bug.cgi?id=52043
    
            * Scripts/webkitpy/common/net/networktransaction.py:
            * Scripts/webkitpy/common/net/networktransaction_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 91559f9..fa4c28e 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-06  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        NetworkTransaction should log the url it is retrying
+        https://bugs.webkit.org/show_bug.cgi?id=52043
+
+        * Scripts/webkitpy/common/net/networktransaction.py:
+        * Scripts/webkitpy/common/net/networktransaction_unittest.py:
+
 2011-01-06  Steve Falkenburg  <sfalken at apple.com>
 
         Windows build fix.
diff --git a/Tools/Scripts/webkitpy/common/net/networktransaction.py b/Tools/Scripts/webkitpy/common/net/networktransaction.py
index de19e94..21cc71f 100644
--- a/Tools/Scripts/webkitpy/common/net/networktransaction.py
+++ b/Tools/Scripts/webkitpy/common/net/networktransaction.py
@@ -58,8 +58,7 @@ class NetworkTransaction(object):
                 if self._convert_404_to_None and e.code == 404:
                     return None
                 self._check_for_timeout()
-                _log.warn("Received HTTP status %s from server.  Retrying in "
-                          "%s seconds..." % (e.code, self._backoff_seconds))
+                _log.warn("Received HTTP status %s loading \"%s\".  Retrying in %s seconds..." % (e.code, e.filename, self._backoff_seconds))
                 self._sleep()
 
     def _check_for_timeout(self):
diff --git a/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py b/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py
index 49aaeed..c4cd4e0 100644
--- a/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py
+++ b/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py
@@ -70,9 +70,9 @@ class NetworkTransactionTest(LoggingTestCase):
         transaction = NetworkTransaction(initial_backoff_seconds=0)
         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.  '
+        self.assertLog(['WARNING: Received HTTP status 500 loading "http://example.com/".  '
                         'Retrying in 0 seconds...\n',
-                        'WARNING: Received HTTP status 500 from server.  '
+                        'WARNING: Received HTTP status 500 loading "http://example.com/".  '
                         'Retrying in 0.0 seconds...\n'])
 
     def test_convert_404_to_None(self):

-- 
WebKit Debian packaging