Revision: 7165
Author: j...@google.com
Date: Tue Nov 24 15:15:57 2009
Log: Merge trunk r7164 into this branch
Disable flaky HtmlUnit test.
svn merge --ignore-ancestry -c7164 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=7165
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/user/test/com/google/gwt/user/client/ui/DOMTest.java
=======================================
--- /releases/2.0/branch-info.txt Tue Nov 24 15:07:18 2009
+++ /releases/2.0/branch-info.txt Tue Nov 24 15:15:57 2009
@@ -1043,3 +1043,8 @@
UI cleanups.
svn merge --ignore-ancestry -c7162 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
+
+tr...@7164 was merged into this branch
+ Disable flaky HtmlUnit test.
+ svn merge --ignore-ancestry -c7164 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
--- /releases/2.0/user/test/com/google/gwt/user/client/ui/DOMTest.java Wed
Oct 28 19:23:32 2009
+++ /releases/2.0/user/test/com/google/gwt/user/client/ui/DOMTest.java Tue
Nov 24 15:15:57 2009
@@ -120,6 +120,7 @@
* Tests {...@link DOM#getAbsoluteLeft(Element)} and
* {...@link DOM#getAbsoluteTop(Element)}.
*/
+ @DoNotRunWith(Platform.HtmlUnit)
public void testGetAbsolutePosition() {
final int border = 8;
final int margin = 9;
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
