[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit a8625f038b7926ec79297c87da35a4650bfc3dc4
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 4 23:17:26 2010 +0000

    2010-10-04  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix.
    
            Handle crash introduced in r69040 if we are not running in a
            Chromium checkout.
    
            * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69050 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ca8e43b..3e8be71 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-04  Dirk Pranke  <dpranke at chromium.org>
 
+        Unreviewed, build fix.
+
+        Handle crash introduced in r69040 if we are not running in a
+        Chromium checkout.
+
+        * Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py:
+
+2010-10-04  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Tony Chang.
 
         Add a way for us to have test expectations that are specific to the
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
index fb92428..c4c885d 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/google_chrome_unittest.py
@@ -88,8 +88,11 @@ class GetGoogleChromePortTest(unittest.TestCase):
             os.path.exists = mock_exists_chrome_found
             codecs.open = mock_open
             chrome_overrides = port.test_expectations_overrides()
-            self.assertEqual(chrome_overrides,
-                             chromium_overrides + expected_string)
+            if chromium_overrides:
+                self.assertEqual(chrome_overrides,
+                                 chromium_overrides + expected_string)
+            else:
+                self.assertEqual(chrome_overrides, expected_string)
         finally:
             os.path.exists = orig_exists
             codecs.open = orig_open

-- 
WebKit Debian packaging