summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 00:02:12 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 00:02:12 +0000
commiteb0271afbb7063722767f46078a391f9297e40d5 (patch)
tree2c251d6724f61cfc3978eba6ebf82d4db74c774b
parente6c52f41e4c993af8d93eecd58420d61296ca1f5 (diff)
downloadchromium_src-eb0271afbb7063722767f46078a391f9297e40d5.zip
chromium_src-eb0271afbb7063722767f46078a391f9297e40d5.tar.gz
chromium_src-eb0271afbb7063722767f46078a391f9297e40d5.tar.bz2
TTF: Re-enable four SafeBrowsingDatabase tests. Add a comment with bug link for the tests being disabled on Mac.
TBR=stuartmorgan BUG=46040 TEST=SafeBrowsingDatabase.* Review URL: http://codereview.chromium.org/2676004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49128 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_database_unittest.cc29
1 files changed, 12 insertions, 17 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index c4ff493..e402d19 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -1180,45 +1180,40 @@ FilePath GetOldUpdatesPath() {
} // namespace
+// Check failed: metric->GetIOCounters(&before), http://crbug.com/46040.
+#if defined(OS_MACOSX)
+#define SKIP_MACOSX(test) DISABLED_##test
+#else
+#define SKIP_MACOSX(test) test
+#endif // defined(OS_MACOSX)
+
// Counts the IO needed for the initial update of a database.
// test\data\safe_browsing\download_update.py was used to fetch the add/sub
// chunks that are read, in order to get repeatable runs.
-TEST(SafeBrowsingDatabase, DISABLED_DatabaseInitialIO) {
+TEST(SafeBrowsingDatabase, SKIP_MACOSX(DatabaseInitialIO)) {
UpdateDatabase(FilePath(), FilePath(), FilePath().AppendASCII("initial"));
}
-// TODO(port): For now on Linux the test below would fail with error below:
-// [1004/201323:FATAL:browser/safe_browsing/safe_browsing_database_impl.cc(712)]
-// Check failed: false.
-//
// Counts the IO needed to update a month old database.
// The data files were generated by running "..\download_update.py postdata"
// in the "safe_browsing\old" directory.
-TEST(SafeBrowsingDatabase, DISABLED_DatabaseOldIO) {
+TEST(SafeBrowsingDatabase, SKIP_MACOSX(DatabaseOldIO)) {
UpdateDatabase(GetOldSafeBrowsingPath(), GetOldResponsePath(),
GetOldUpdatesPath());
}
-// TODO(port): For now on Linux the test below would fail with error below:
-// [1004/201323:FATAL:browser/safe_browsing/safe_browsing_database_impl.cc(712)]
-// Check failed: false.
-//
// Like DatabaseOldIO but only the deletes.
-TEST(SafeBrowsingDatabase, DISABLED_DatabaseOldDeletesIO) {
+TEST(SafeBrowsingDatabase, SKIP_MACOSX(DatabaseOldDeletesIO)) {
UpdateDatabase(GetOldSafeBrowsingPath(), GetOldResponsePath(), FilePath());
}
// Like DatabaseOldIO but only the updates.
-TEST(SafeBrowsingDatabase, DISABLED_DatabaseOldUpdatesIO) {
+TEST(SafeBrowsingDatabase, SKIP_MACOSX(DatabaseOldUpdatesIO)) {
UpdateDatabase(GetOldSafeBrowsingPath(), FilePath(), GetOldUpdatesPath());
}
-// TODO(port): For now on Linux the test below would fail with error below:
-// [1004/201323:FATAL:browser/safe_browsing/safe_browsing_database_impl.cc(712)]
-// Check failed: false.
-//
// Does a a lot of addel's on very large chunks.
-TEST(SafeBrowsingDatabase, DISABLED_DatabaseOldLotsofDeletesIO) {
+TEST(SafeBrowsingDatabase, SKIP_MACOSX(DatabaseOldLotsofDeletesIO)) {
std::vector<ChunksInfo> chunks;
std::vector<SBChunkDelete> deletes;
SBChunkDelete del;