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

Side by Side Diff: chrome/test/mini_installer_test/test.cc

Issue 99142: One more try to make these tests pass. Added a while loop to wait until the k... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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 | « chrome/test/mini_installer_test/chrome_mini_installer.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #include "base/platform_thread.h" 4 #include "base/platform_thread.h"
5 #include "base/win_util.h" 5 #include "base/win_util.h"
6 #include "chrome/installer/util/install_util.h" 6 #include "chrome/installer/util/install_util.h"
7 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" 7 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 9
10 #include "chrome_mini_installer.h" 10 #include "chrome_mini_installer.h"
(...skipping 20 matching lines...) Expand all
31 } 31 }
32 }; 32 };
33 }; 33 };
34 34
35 TEST_F(MiniInstallTest, FullInstallerTest) { 35 TEST_F(MiniInstallTest, FullInstallerTest) {
36 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); 36 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
37 installer.InstallFullInstaller(); 37 installer.InstallFullInstaller();
38 } 38 }
39 39
40 // Will enable this test after bug#9593 gets fixed. 40 // Will enable this test after bug#9593 gets fixed.
41 TEST_F(MiniInstallTest, DISABLED_DifferentialInstallerTest) { 41 TEST_F(MiniInstallTest, DifferentialInstallerTest) {
42 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); 42 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
43 installer.InstallDifferentialInstaller(); 43 installer.InstallDifferentialInstaller();
44 } 44 }
45 45
46 TEST_F(MiniInstallTest, DISABLED_StandaloneInstallerTest) { 46 TEST_F(MiniInstallTest, DISABLED_StandaloneInstallerTest) {
47 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); 47 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
48 installer.InstallStandaloneIntaller(); 48 installer.InstallStandaloneIntaller();
49 } 49 }
50 50
51 TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) { 51 TEST_F(MiniInstallTest, DISABLED_MiniInstallerOverChromeMetaInstallerTest) {
52 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); 52 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
53 installer.OverInstall(); 53 installer.OverInstall();
54 } 54 }
55 55
56 TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) { 56 TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) {
57 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { 57 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
58 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall); 58 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall);
59 installer.Install(); 59 installer.Install();
60 } 60 }
61 } 61 }
62 62
63 TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) { 63 TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) {
64 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { 64 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
65 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall); 65 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
66 installer.Install(); 66 installer.Install();
67 } 67 }
68 } 68 }
69 69
70 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) { 70 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) {
71 // We run the tests on all supported OSes. 71 // We run the tests on all supported OSes.
72 // Make sure the code agrees. 72 // Make sure the code agrees.
73 EXPECT_TRUE(InstallUtil::IsOSSupported()); 73 EXPECT_TRUE(InstallUtil::IsOSSupported());
74 } 74 }
OLDNEW
« no previous file with comments | « chrome/test/mini_installer_test/chrome_mini_installer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698