summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 18:14:01 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-10 18:14:01 +0000
commit8fbbe47f8271a1e2c112d1f8dd3ee5fb35a0edca (patch)
treef99faa4f47291dcf2d5db641ab50c0404d4c6031 /chrome
parent35b9aa07e104d4a228778cbffc9577087ba80b07 (diff)
downloadchromium_src-8fbbe47f8271a1e2c112d1f8dd3ee5fb35a0edca.zip
chromium_src-8fbbe47f8271a1e2c112d1f8dd3ee5fb35a0edca.tar.gz
chromium_src-8fbbe47f8271a1e2c112d1f8dd3ee5fb35a0edca.tar.bz2
TTF: Re-enable ActiveNotificationTrackerTest.TestLookupAndClear. The test was
disabled because it failed under valgrind. Now the test is specifically disabled for Valgrind only. TBR=johnnyg BUG=43764 TEST=none Review URL: http://codereview.chromium.org/2036008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46831 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/common/desktop_notifications/active_notification_tracker_unittest.cc2
-rw-r--r--chrome/test/data/valgrind/unit_tests.gtest.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/common/desktop_notifications/active_notification_tracker_unittest.cc b/chrome/common/desktop_notifications/active_notification_tracker_unittest.cc
index 38c9d65..b741d35 100644
--- a/chrome/common/desktop_notifications/active_notification_tracker_unittest.cc
+++ b/chrome/common/desktop_notifications/active_notification_tracker_unittest.cc
@@ -5,7 +5,7 @@
#include "chrome/common/desktop_notifications/active_notification_tracker.h"
#include "testing/gtest/include/gtest/gtest.h"
-TEST(ActiveNotificationTrackerTest, DISABLED_TestLookupAndClear) {
+TEST(ActiveNotificationTrackerTest, TestLookupAndClear) {
ActiveNotificationTracker tracker;
WebKit::WebNotification notification1;
diff --git a/chrome/test/data/valgrind/unit_tests.gtest.txt b/chrome/test/data/valgrind/unit_tests.gtest.txt
index 6cfc18e..a67f84d 100644
--- a/chrome/test/data/valgrind/unit_tests.gtest.txt
+++ b/chrome/test/data/valgrind/unit_tests.gtest.txt
@@ -6,3 +6,6 @@ VisitedLinkRelayTest.Basics
RenderViewTest.ImeComposition
# Hangs sometimes; see http://crbug.com/24416
DnsMasterTest.MassiveConcurrentLookupTest
+# From r44017: Failure is related to the fact that I can't create distinct
+# WebCore objects in the test. http://crbug.com/43764
+ActiveNotificationTrackerTest.TestLookupAndClear