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

Side by Side Diff: chrome/installer/util/installer_state_unittest.cc

Issue 12207128: Temporarily disable failing Win64 tests relying on pe_image (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « base/win/pe_image_unittest.cc ('k') | 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 <windows.h> 5 #include <windows.h>
6 6
7 #include <fstream> 7 #include <fstream>
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 ASSERT_TRUE(temp_handle != NULL); 489 ASSERT_TRUE(temp_handle != NULL);
490 490
491 // The file should now be in use. 491 // The file should now be in use.
492 EXPECT_TRUE(MockInstallerState::IsFileInUse(temp_file)); 492 EXPECT_TRUE(MockInstallerState::IsFileInUse(temp_file));
493 } 493 }
494 494
495 // And once the handle is gone, it should no longer be in use. 495 // And once the handle is gone, it should no longer be in use.
496 EXPECT_FALSE(MockInstallerState::IsFileInUse(temp_file)); 496 EXPECT_FALSE(MockInstallerState::IsFileInUse(temp_file));
497 } 497 }
498 498
499 TEST_F(InstallerStateTest, RemoveOldVersionDirs) { 499 // TODO(jschuh): crbug.com/167707 need to fix Win64 pe_image issues due to
500 // calling upgrade_test::GenerateSpecificPEFileVersion
501 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
502 #define MAYBE_RemoveOldVersionDirs DISABLED_RemoveOldVersionDirs
503 #else
504 #define MAYBE_RemoveOldVersionDirs RemoveOldVersionDirs
505 #endif
506
507 TEST_F(InstallerStateTest, MAYBE_RemoveOldVersionDirs) {
500 MockInstallerState installer_state; 508 MockInstallerState installer_state;
501 installer_state.set_target_path(test_dir_.path()); 509 installer_state.set_target_path(test_dir_.path());
502 EXPECT_EQ(test_dir_.path().value(), installer_state.target_path().value()); 510 EXPECT_EQ(test_dir_.path().value(), installer_state.target_path().value());
503 511
504 const char kOldVersion[] = "2.0.0.0"; 512 const char kOldVersion[] = "2.0.0.0";
505 const char kNewVersion[] = "3.0.0.0"; 513 const char kNewVersion[] = "3.0.0.0";
506 const char kOldChromeExeVersion[] = "2.1.0.0"; 514 const char kOldChromeExeVersion[] = "2.1.0.0";
507 const char kChromeExeVersion[] = "2.1.1.1"; 515 const char kChromeExeVersion[] = "2.1.1.1";
508 const char kNewChromeExeVersion[] = "3.0.0.0"; 516 const char kNewChromeExeVersion[] = "3.0.0.0";
509 517
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 // Critical update newer than the new version. 756 // Critical update newer than the new version.
749 EXPECT_FALSE( 757 EXPECT_FALSE(
750 installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid()); 758 installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid());
751 EXPECT_FALSE( 759 EXPECT_FALSE(
752 installer_state.DetermineCriticalVersion(opv_version_, *pv_version_) 760 installer_state.DetermineCriticalVersion(opv_version_, *pv_version_)
753 .IsValid()); 761 .IsValid());
754 EXPECT_FALSE( 762 EXPECT_FALSE(
755 installer_state.DetermineCriticalVersion(pv_version_, *pv_version_) 763 installer_state.DetermineCriticalVersion(pv_version_, *pv_version_)
756 .IsValid()); 764 .IsValid());
757 } 765 }
OLDNEW
« no previous file with comments | « base/win/pe_image_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698