[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
victorw at chromium.org
victorw at chromium.org
Wed Dec 22 13:47:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cd5c94d30ce6634d82a70e5fb8247b76dff571c3
Author: victorw at chromium.org <victorw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 27 06:11:56 2010 +0000
2010-09-26 Victor Wang <victorw at chromium.org>
Reviewed by Adam Barth.
Update layout test notification-replace.html to be platform independent.
This layout test fails on windows if it is not running from C drive.
This is caused by local icon urls used by the test and this makes the
test becomes platform dependent. Change the icon urls so that the test
results are same for all platforms.
https://bugs.webkit.org/show_bug.cgi?id=45824
* fast/notifications/notifications-replace-expected.txt:
* fast/notifications/notifications-replace.html:
* platform/chromium-linux/fast/notifications: Removed.
* platform/chromium-linux/fast/notifications/notifications-replace-expected.txt: Removed.
* platform/chromium-win/fast/notifications: Removed.
* platform/chromium-win/fast/notifications/notifications-replace-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68372 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6c83656..1a13050 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-26 Victor Wang <victorw at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Update layout test notification-replace.html to be platform independent.
+
+ This layout test fails on windows if it is not running from C drive.
+ This is caused by local icon urls used by the test and this makes the
+ test becomes platform dependent. Change the icon urls so that the test
+ results are same for all platforms.
+
+ https://bugs.webkit.org/show_bug.cgi?id=45824
+
+ * fast/notifications/notifications-replace-expected.txt:
+ * fast/notifications/notifications-replace.html:
+ * platform/chromium-linux/fast/notifications: Removed.
+ * platform/chromium-linux/fast/notifications/notifications-replace-expected.txt: Removed.
+ * platform/chromium-win/fast/notifications: Removed.
+ * platform/chromium-win/fast/notifications/notifications-replace-expected.txt: Removed.
+
2010-09-26 Andrei Popescu <andreip at google.com>
Reviewed by Adam Barth.
diff --git a/LayoutTests/fast/notifications/notifications-replace-expected.txt b/LayoutTests/fast/notifications/notifications-replace-expected.txt
index a4f7fc4..2480ba3 100644
--- a/LayoutTests/fast/notifications/notifications-replace-expected.txt
+++ b/LayoutTests/fast/notifications/notifications-replace-expected.txt
@@ -1,7 +1,7 @@
-DESKTOP NOTIFICATION: icon file:///email.png, title New E-mail, text Meet me tonight at 8!
-DESKTOP NOTIFICATION: icon file:///alarm.png, title Alarm, text It's time to wake up!
+DESKTOP NOTIFICATION: icon , title New E-mail, text Meet me tonight at 8!
+DESKTOP NOTIFICATION: icon , title Alarm, text It's time to wake up!
REPLACING NOTIFICATION New E-mail
-DESKTOP NOTIFICATION: icon file:///email.png, title New reply, text Correction, 8:15
+DESKTOP NOTIFICATION: icon , title New reply, text Correction, 8:15
Showing notifications with replace ID...
diff --git a/LayoutTests/fast/notifications/notifications-replace.html b/LayoutTests/fast/notifications/notifications-replace.html
index 1200cc6..2132214 100644
--- a/LayoutTests/fast/notifications/notifications-replace.html
+++ b/LayoutTests/fast/notifications/notifications-replace.html
@@ -18,12 +18,12 @@
log("FAIL: No webkitNotifications interface!");
}
- var M = window.webkitNotifications.createNotification("/email.png", "New E-mail", "Meet me tonight at 8!");
+ var M = window.webkitNotifications.createNotification("", "New E-mail", "Meet me tonight at 8!");
M.replaceId = "NewMail";
M.show();
- var other = window.webkitNotifications.createNotification("/alarm.png", "Alarm", "It's time to wake up!");
+ var other = window.webkitNotifications.createNotification("", "Alarm", "It's time to wake up!");
other.show();
- var N = window.webkitNotifications.createNotification("/email.png", "New reply", "Correction, 8:15");
+ var N = window.webkitNotifications.createNotification("", "New reply", "Correction, 8:15");
N.replaceId = "NewMail";
N.show();
}
diff --git a/LayoutTests/platform/chromium-linux/fast/notifications/notifications-replace-expected.txt b/LayoutTests/platform/chromium-linux/fast/notifications/notifications-replace-expected.txt
deleted file mode 100644
index 45075f8..0000000
--- a/LayoutTests/platform/chromium-linux/fast/notifications/notifications-replace-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-DESKTOP NOTIFICATION: icon file:///email.png, title New E-mail, text Meet me tonight at 8!
-DESKTOP NOTIFICATION: icon file:///alarm.png, title Alarm, text It's time to wake up!
-REPLACING NOTIFICATION New E-mail
-DESKTOP NOTIFICATION: icon file:///email.png, title New reply, text Correction, 8:15
-Showing notifications with replace ID...
diff --git a/LayoutTests/platform/chromium-win/fast/notifications/notifications-replace-expected.txt b/LayoutTests/platform/chromium-win/fast/notifications/notifications-replace-expected.txt
deleted file mode 100644
index 69d851a..0000000
--- a/LayoutTests/platform/chromium-win/fast/notifications/notifications-replace-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-DESKTOP NOTIFICATION: icon file:///C:/email.png, title New E-mail, text Meet me tonight at 8!
-DESKTOP NOTIFICATION: icon file:///C:/alarm.png, title Alarm, text It's time to wake up!
-REPLACING NOTIFICATION New E-mail
-DESKTOP NOTIFICATION: icon file:///C:/email.png, title New reply, text Correction, 8:15
-Showing notifications with replace ID...
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list