summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-29 09:53:58 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-29 09:53:58 +0000
commitee4461f9b3d9f31f1ef203400e6baa395731f360 (patch)
treedc137b5319428e1b3859c1ef2a5a497fa9e94bae /chrome
parent63b39c73dd951416f6c1808f34a10ca422336610 (diff)
downloadchromium_src-ee4461f9b3d9f31f1ef203400e6baa395731f360.zip
chromium_src-ee4461f9b3d9f31f1ef203400e6baa395731f360.tar.gz
chromium_src-ee4461f9b3d9f31f1ef203400e6baa395731f360.tar.bz2
GTTF: remove flaky mark from following tests:
- FilePathWatcherTest.DeleteAndRecreate (bug 54822) - FilePathWatcherTest.DirectoryChain (bug 54822) - FilePathWatcherTest.MoveChild (bug 54822) - FilePathWatcherTest.MoveParent (bug 54822) - FilePathWatcherTest.NonExistentDirectory (bug 54822) - AccountScreenTest.TestSchemeInspector (bug 46274) - SavePageBrowserTest.SaveCompleteHTML (bug 52292) - DownloadRequestLimiterTest.Allow (bug 39753) - PPAPITest.Graphics2D (bug 54150) - ExtensionApiTest.Storage (bug 42943) - BrowserEncodingTest.TestEncodingAliasMapping (bug 51716) - BrowserCrApplicationAppleScriptTest.InsertWindow (bug 53584) - ExtensionInstallUIBrowserTest.TestThemeInstallUndoResetsToDefault (bug 43441) TBR=mal BUG=54822, 46274, 52292, 39753, 54150, 42943, 51716, 53584, 43441 TEST=none Review URL: http://codereview.chromium.org/3545003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_encoding_uitest.cc3
-rw-r--r--chrome/browser/chromeos/login/account_screen_browsertest.cc2
-rw-r--r--chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm4
-rw-r--r--chrome/browser/download/download_request_limiter_unittest.cc3
-rw-r--r--chrome/browser/download/save_page_browsertest.cc3
-rw-r--r--chrome/browser/extensions/extension_install_ui_browsertest.cc3
-rw-r--r--chrome/browser/extensions/extension_storage_apitest.cc9
-rw-r--r--chrome/browser/file_path_watcher_unittest.cc10
-rw-r--r--chrome/test/ui/ppapi_uitest.cc3
9 files changed, 13 insertions, 27 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index e232c5e..1b52a3d 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -52,8 +52,7 @@ class BrowserEncodingTest : public UITest {
// 2. Add more files with multiple encoding name variants for each canonical
// encoding name). Webkit layout tests cover some, but testing in the UI test is
// also necessary.
-// Marked as flaky: http://crbug.com/51716
-TEST_F(BrowserEncodingTest, FLAKY_TestEncodingAliasMapping) {
+TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
struct EncodingTestData {
const char* file_name;
const char* encoding_name;
diff --git a/chrome/browser/chromeos/login/account_screen_browsertest.cc b/chrome/browser/chromeos/login/account_screen_browsertest.cc
index f807a37..eec150d 100644
--- a/chrome/browser/chromeos/login/account_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/account_screen_browsertest.cc
@@ -68,7 +68,7 @@ static URLRequestJob* InspectorHook(URLRequest* request,
return new URLRequestAboutJob(request);
}
-IN_PROC_BROWSER_TEST_F(AccountScreenTest, FLAKY_TestSchemeInspector) {
+IN_PROC_BROWSER_TEST_F(AccountScreenTest, TestSchemeInspector) {
ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(
chrome::kCrosScheme);
URLRequestFilter::GetInstance()->AddHostnameHandler(chrome::kCrosScheme,
diff --git a/chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm b/chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm
index bea3b43..2825ef2 100644
--- a/chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm
+++ b/chrome/browser/cocoa/applescript/browsercrapplication+applescript_test.mm
@@ -37,9 +37,7 @@ IN_PROC_BROWSER_TEST_F(BrowserCrApplicationAppleScriptTest, Creation) {
}
// Insert a new window.
-// Failing on Chromium Mac: http://crbug/53584
-IN_PROC_BROWSER_TEST_F(BrowserCrApplicationAppleScriptTest,
- FLAKY_InsertWindow) {
+IN_PROC_BROWSER_TEST_F(BrowserCrApplicationAppleScriptTest, InsertWindow) {
// Emulate what applescript would do when creating a new window.
// Emulate a script like |set var to make new window with properties
// {visible:false}|.
diff --git a/chrome/browser/download/download_request_limiter_unittest.cc b/chrome/browser/download/download_request_limiter_unittest.cc
index d8582a9..cf0d90d 100644
--- a/chrome/browser/download/download_request_limiter_unittest.cc
+++ b/chrome/browser/download/download_request_limiter_unittest.cc
@@ -88,8 +88,7 @@ class DownloadRequestLimiterTest
ChromeThread io_thread_;
};
-// http://code.google.com/p/chromium/issues/detail?id=39753
-TEST_F(DownloadRequestLimiterTest, FLAKY_Allow) {
+TEST_F(DownloadRequestLimiterTest, Allow) {
// All tabs should initially start at ALLOW_ONE_DOWNLOAD.
ASSERT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
download_request_limiter_->GetDownloadStatus(
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 512aaaa..bed7228 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -107,8 +107,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveViewSourceHTMLOnly) {
full_file_name));
}
-// See http://crbug.com/52292
-IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, FLAKY_SaveCompleteHTML) {
+IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveCompleteHTML) {
FilePath file_name(FILE_PATH_LITERAL("b.htm"));
GURL url = URLRequestMockHTTPJob::GetMockUrl(
FilePath(kTestDir).Append(file_name));
diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc
index a9dc844..bf198ab 100644
--- a/chrome/browser/extensions/extension_install_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc
@@ -33,9 +33,8 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest {
}
};
-// Flaky, http://crbug.com/43441.
IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
- FLAKY_TestThemeInstallUndoResetsToDefault) {
+ TestThemeInstallUndoResetsToDefault) {
// Install theme once and undo to verify we go back to default theme.
FilePath theme_path = test_data_dir_.AppendASCII("theme.crx");
ASSERT_TRUE(InstallExtensionWithUI(theme_path, 1));
diff --git a/chrome/browser/extensions/extension_storage_apitest.cc b/chrome/browser/extensions/extension_storage_apitest.cc
index 032c6ba..b75cc0e 100644
--- a/chrome/browser/extensions/extension_storage_apitest.cc
+++ b/chrome/browser/extensions/extension_storage_apitest.cc
@@ -4,13 +4,6 @@
#include "chrome/browser/extensions/extension_apitest.h"
-#if defined(OS_LINUX) || defined(OS_MACOSX)
-// See http://crbug.com/42943.
-#define MAYBE_Storage FLAKY_Storage
-#else
-#define MAYBE_Storage Storage
-#endif
-
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Storage) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Storage) {
ASSERT_TRUE(RunExtensionTest("storage")) << message_;
}
diff --git a/chrome/browser/file_path_watcher_unittest.cc b/chrome/browser/file_path_watcher_unittest.cc
index 8099c2d..82dfe99 100644
--- a/chrome/browser/file_path_watcher_unittest.cc
+++ b/chrome/browser/file_path_watcher_unittest.cc
@@ -300,7 +300,7 @@ TEST_F(FilePathWatcherTest, MAYBE(MultipleWatchersSingleFile)) {
// Verify that watching a file whose parent directory doesn't exist yet works if
// the directory and file are created eventually.
-TEST_F(FilePathWatcherTest, MAYBE(NonExistentDirectory)) {
+TEST_F(FilePathWatcherTest, NonExistentDirectory) {
FilePathWatcher watcher;
FilePath dir(temp_dir_->path().AppendASCII("dir"));
FilePath file(dir.AppendASCII("file"));
@@ -322,7 +322,7 @@ TEST_F(FilePathWatcherTest, MAYBE(NonExistentDirectory)) {
// Exercises watch reconfiguration for the case that directories on the path
// are rapidly created.
-TEST_F(FilePathWatcherTest, MAYBE(DirectoryChain)) {
+TEST_F(FilePathWatcherTest, DirectoryChain) {
FilePath path(temp_dir_->path());
std::vector<std::string> dir_names;
for (int i = 0; i < 20; i++) {
@@ -369,7 +369,7 @@ TEST_F(FilePathWatcherTest, DisappearingDirectory) {
}
// Tests that a file that is deleted and reappears is tracked correctly.
-TEST_F(FilePathWatcherTest, MAYBE(DeleteAndRecreate)) {
+TEST_F(FilePathWatcherTest, DeleteAndRecreate) {
ASSERT_TRUE(WriteFile(test_file(), "content"));
FilePathWatcher watcher;
scoped_refptr<TestDelegate> delegate(new TestDelegate);
@@ -407,7 +407,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
EXPECT_LE(1, WaitForEvents(delegate.get()));
}
-TEST_F(FilePathWatcherTest, MAYBE(MoveParent)) {
+TEST_F(FilePathWatcherTest, MoveParent) {
FilePathWatcher file_watcher;
FilePathWatcher subdir_watcher;
FilePath dir(temp_dir_->path().AppendASCII("dir"));
@@ -437,7 +437,7 @@ TEST_F(FilePathWatcherTest, MAYBE(MoveParent)) {
EXPECT_LE(1, WaitForEvents(subdir_delegate.get()));
}
-TEST_F(FilePathWatcherTest, MAYBE(MoveChild)) {
+TEST_F(FilePathWatcherTest, MoveChild) {
FilePathWatcher file_watcher;
FilePathWatcher subdir_watcher;
FilePath source_dir(temp_dir_->path().AppendASCII("source"));
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index f4a1021..11076d3 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -91,8 +91,7 @@ TEST_F(PPAPITest, FAILS_Instance) {
RunTest("Instance");
}
-// http://crbug.com/54150
-TEST_F(PPAPITest, FLAKY_Graphics2D) {
+TEST_F(PPAPITest, Graphics2D) {
RunTest("Graphics2D");
}