[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3c8d3606225e5c7ecff48c5965d64c4dee8177f6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 22:44:21 2009 +0000

    2009-10-19  Jason Yan  <tailofthesun at gmail.com>
    
             Reviewed by Eric Seidel.
    
             Fixed issue with LayoutTests/fast/cookies/local-file-can-set-cookies.html
             which can fail when the system under test has local file cookies set already.
             https://bugs.webkit.org/show_bug.cgi?id=30281
    
             * fast/cookies/local-file-can-set-cookies-expected.txt: Modified. Updated expected results.
             * fast/cookies/local-file-can-set-cookies.html: Modified. Check for existing cookie and set non-persistent cookie.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49819 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4643aa1..952846d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-19  Jason Yan  <tailofthesun at gmail.com>
+ 
+         Reviewed by Eric Seidel.
+ 
+         Fixed issue with LayoutTests/fast/cookies/local-file-can-set-cookies.html
+         which can fail when the system under test has local file cookies set already.
+         https://bugs.webkit.org/show_bug.cgi?id=30281
+ 
+         * fast/cookies/local-file-can-set-cookies-expected.txt: Modified. Updated expected results.
+         * fast/cookies/local-file-can-set-cookies.html: Modified. Check for existing cookie and set non-persistent cookie.
+
 2009-10-19  Shu Chang  <Chang.Shu at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/fast/cookies/local-file-can-set-cookies-expected.txt b/LayoutTests/fast/cookies/local-file-can-set-cookies-expected.txt
index 09ccb0a..0886317 100644
--- a/LayoutTests/fast/cookies/local-file-can-set-cookies-expected.txt
+++ b/LayoutTests/fast/cookies/local-file-can-set-cookies-expected.txt
@@ -3,7 +3,8 @@ This test checks that a local file can set cookies. See: rdar://problem/5379090
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS document.cookie is 'ppkcookie1=testcookie'
+PASS document.cookie.indexOf('ppkcookie1=testcookie') is -1
+PASS document.cookie.indexOf('ppkcookie1=testcookie') >= 0 is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/fast/cookies/local-file-can-set-cookies.html b/LayoutTests/fast/cookies/local-file-can-set-cookies.html
index b67c9f6..10468ae 100644
--- a/LayoutTests/fast/cookies/local-file-can-set-cookies.html
+++ b/LayoutTests/fast/cookies/local-file-can-set-cookies.html
@@ -11,10 +11,9 @@
 <script>
     description('This test checks that a local file can set cookies.  See: rdar://problem/5379090 REGRESSION: Cannot set cookies for local files');
 
-    var date = new Date();
-    date.setTime(date.getTime() + (60*1000));
-    document.cookie = 'ppkcookie1=testcookie; expires=' + date.toGMTString();
-    shouldBe("document.cookie", "'ppkcookie1=testcookie'");
+    shouldBe("document.cookie.indexOf('ppkcookie1=testcookie')", "-1");
+    document.cookie = 'ppkcookie1=testcookie';
+    shouldBeTrue("document.cookie.indexOf('ppkcookie1=testcookie') >= 0");
 
     var successfullyParsed = true;
 </script>

-- 
WebKit Debian packaging