summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-13 15:09:14 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-13 15:09:14 +0000
commit01380a96d4796ae49d4d2b14ef7815500be63d76 (patch)
tree6253b43dddd32363149dce1d5ce0a884c6260cad
parent836061bde615432d5dfcce8c26a23f217bfdbd29 (diff)
downloadchromium_src-01380a96d4796ae49d4d2b14ef7815500be63d76.zip
chromium_src-01380a96d4796ae49d4d2b14ef7815500be63d76.tar.gz
chromium_src-01380a96d4796ae49d4d2b14ef7815500be63d76.tar.bz2
Disable PrintingLayoutTest.Delayed on Windows 2000 (even though it's already disabled). Also disable PrintingLayoutTest.IFrame, it's still flaky.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@800 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/printing/printing_layout_uitest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index 97675c3..d2b9ff8 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -568,6 +568,10 @@ TEST_F(PrintingLayoutTestHidden, ManyTimes) {
TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
if (IsTestCaseDisabled())
return;
+ // TODO(maruel): This test is failing on Windows 2000. I haven't investigated
+ // why.
+ if (win_util::GetWinVersion() < win_util::WINVERSION_XP)
+ return;
TestServer server(kDocRoot);
@@ -605,7 +609,7 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
}
// Prints a popup and immediately closes it.
-TEST_F(PrintingLayoutTest, IFrame) {
+TEST_F(PrintingLayoutTest, DISABLED_IFrame) {
if (IsTestCaseDisabled())
return;