Skip to content

Commit

Permalink
Disable part of the Importer unit test because it fails
Browse files Browse the repository at this point in the history
on windows sp3 (clean machine).

See bug 2466.

Review URL: http://codereview.chromium.org/3127

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2344 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
nsylvain@chromium.org committed Sep 18, 2008
1 parent f9b82d8 commit 7a89f55
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions chrome/browser/importer/importer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,12 @@ class TestObserver : public ProfileWriter,
MessageLoop::current()->Quit();
EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_);
EXPECT_EQ(1, history_count_);
#if 0 // This part of the test is disabled. See bug #2466
if (IsWindowsVista())
EXPECT_EQ(0, password_count_);
else
EXPECT_EQ(1, password_count_);
#endif
}

virtual bool BookmarkModelIsLoaded() const {
Expand Down Expand Up @@ -304,6 +306,7 @@ TEST_F(ImporterTest, IEImporter) {

// Sets up dummy password data.
HRESULT res;
#if 0 // This part of the test is disabled. See bug #2466
CComPtr<IPStore> pstore;
HMODULE pstorec_dll;
GUID type = IEImporter::kUnittestGUID;
Expand All @@ -324,6 +327,7 @@ TEST_F(ImporterTest, IEImporter) {
pstore->CreateSubtype(0, &type, &subtype, &type_info, NULL, 0);
WritePStore(pstore, &type, &subtype);
}
#endif

// Sets up a special history link.
CComPtr<IUrlHistoryStg2> url_history_stg2;
Expand Down Expand Up @@ -351,12 +355,14 @@ TEST_F(ImporterTest, IEImporter) {
// Cleans up.
url_history_stg2->DeleteUrl(kIEIdentifyUrl, 0);
url_history_stg2.Release();
#if 0 // This part of the test is disabled. See bug #2466
if (!IsWindowsVista()) {
ClearPStoreType(pstore, &type, &subtype);
// Releases it befor unload the dll.
pstore.Release();
FreeLibrary(pstorec_dll);
}
#endif
}

TEST_F(ImporterTest, IE7Importer) {
Expand Down

0 comments on commit 7a89f55

Please sign in to comment.