Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Side by Side Diff: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc

Issue 588663003: Disable flaky test: MediaGalleriesRead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/auto_reset.h" 5 #include "base/auto_reset.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/numerics/safe_conversions.h" 10 #include "base/numerics/safe_conversions.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 508
509 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, NoGalleriesRead) { 509 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, NoGalleriesRead) {
510 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries")) << message_; 510 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries")) << message_;
511 } 511 }
512 512
513 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, 513 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
514 NoGalleriesCopyTo) { 514 NoGalleriesCopyTo) {
515 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries_copy_to")) << message_; 515 ASSERT_TRUE(RunMediaGalleriesTest("no_galleries_copy_to")) << message_;
516 } 516 }
517 517
518 // Test is flaky. crbug.com/416128
519 #if defined(OS_MACOSX)
520 #define MAYBE_MediaGalleriesRead DISABLED_MediaGalleriesRead
521 #else
522 #define MAYBE_MediaGalleriesRead MediaGalleriesRead
523 #endif
518 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, 524 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest,
519 MediaGalleriesRead) { 525 MAYBE_MediaGalleriesRead) {
520 RemoveAllGalleries(); 526 RemoveAllGalleries();
521 MakeSingleFakeGallery(NULL); 527 MakeSingleFakeGallery(NULL);
522 base::ListValue custom_args; 528 base::ListValue custom_args;
523 custom_args.AppendInteger(test_jpg_size()); 529 custom_args.AppendInteger(test_jpg_size());
524 530
525 ASSERT_TRUE(RunMediaGalleriesTestWithArg("read_access", custom_args)) 531 ASSERT_TRUE(RunMediaGalleriesTestWithArg("read_access", custom_args))
526 << message_; 532 << message_;
527 } 533 }
528 534
529 // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux 535 // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 675
670 base::ListValue custom_args; 676 base::ListValue custom_args;
671 #if defined(USE_PROPRIETARY_CODECS) 677 #if defined(USE_PROPRIETARY_CODECS)
672 custom_args.AppendBoolean(true); 678 custom_args.AppendBoolean(true);
673 #else 679 #else
674 custom_args.AppendBoolean(false); 680 custom_args.AppendBoolean(false);
675 #endif 681 #endif
676 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args)) 682 ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args))
677 << message_; 683 << message_;
678 } 684 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698