Skip to content

Commit

Permalink
Add a check to help prevent PrintingContextTest flakiness.
Browse files Browse the repository at this point in the history
BUG=61509
TEST=Less flaky printing tests.
Review URL: http://codereview.chromium.org/5406005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67802 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
thestig@chromium.org committed Dec 1, 2010
1 parent 4f03a2d commit e055fe2
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions printing/printing_context_win_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,12 @@ HRESULT WINAPI PrintDlgExMock(LPPRINTDLGEX lppd) {
return S_OK;
}

// crbug.com/61509
TEST_F(PrintingContextTest, FLAKY_Base) {
printing::PrintSettings settings;
TEST_F(PrintingContextTest, Base) {
// Sometimes ::GetDefaultPrinter() fails? bug 61509.
if (IsTestCaseDisabled())
return;

printing::PrintSettings settings;
settings.set_device_name(GetDefaultPrinter());
// Initialize it.
scoped_ptr<printing::PrintingContext> context(
Expand All @@ -120,8 +122,11 @@ TEST_F(PrintingContextTest, FLAKY_Base) {
EXPECT_TRUE(ModifyWorldTransform(context->context(), NULL, MWT_IDENTITY));
}

// http://crbug.com/61499
TEST_F(PrintingContextTest, FLAKY_PrintAll) {
TEST_F(PrintingContextTest, PrintAll) {
// Sometimes ::GetDefaultPrinter() fails? bug 61509.
if (IsTestCaseDisabled())
return;

printing::PrintingContextWin context;
context.SetPrintDialog(&PrintDlgExMock);
context.AskUserForSettings(
Expand Down

0 comments on commit e055fe2

Please sign in to comment.