diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-01 02:05:39 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-01 02:05:39 +0000 |
| commit | e055fe2b92506a6daa749074315b8fe89fdcd428 (patch) | |
| tree | a2715854722b8172568d9cfbdbc517bf4ebf0cf0 /printing | |
| parent | 4f03a2d30f59eff3dac79c87bdacb408adc27072 (diff) | |
| download | chromium_src-e055fe2b92506a6daa749074315b8fe89fdcd428.zip chromium_src-e055fe2b92506a6daa749074315b8fe89fdcd428.tar.gz chromium_src-e055fe2b92506a6daa749074315b8fe89fdcd428.tar.bz2 | |
Add a check to help prevent PrintingContextTest flakiness.
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
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/printing_context_win_unittest.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc index e8960d58..c43bb03 100644 --- a/printing/printing_context_win_unittest.cc +++ b/printing/printing_context_win_unittest.cc @@ -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( @@ -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( |