Two of the installer tests were failing because of path issues. Looks like buildbots like absolute paths. Fixed the issue now.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13071 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 47 insertions, 31 deletions

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index 96bb5ca..4b6e840 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -20,27 +20,38 @@
 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+// Installs Chrome.
+void ChromeMiniInstaller::Install() {
+  std::wstring installer_path = GetInstallerExePath(
+      mini_installer_constants::kChromeMiniInstallerExecutable);
+  InstallMiniInstaller(false, installer_path);
+}
+
 // This method will get the previous latest full installer from
 // nightly location, install it and over install with diff installer.
 void ChromeMiniInstaller::InstallDifferentialInstaller() {
-  std::wstring diff_installer;
-  ASSERT_TRUE(GetInstaller(mini_installer_constants::kDiffInstallerPattern,
-                           &diff_installer));
-  printf("\nLatest differential installer name is %ls\n",
-         diff_installer.c_str());
-  std::wstring prev_full_installer;
-  ASSERT_TRUE(GetPreviousFullInstaller(diff_installer, &prev_full_installer));
-  printf("\nPrevious full installer name is %ls\n",
-         prev_full_installer.c_str());
-  InstallMiniInstaller(false, prev_full_installer);
-  std::wstring full_installer_value;
-  GetChromeVersionFromRegistry(&full_installer_value);
-  printf("\n\nPreparing to overinstall...\n");
-  InstallMiniInstaller(false, diff_installer);
-  std::wstring diff_installer_value;
-  GetChromeVersionFromRegistry(&diff_installer_value);
-  ASSERT_TRUE(VerifyDifferentialInstall(full_installer_value,
-                                        diff_installer_value, diff_installer));
+  if (!IsChromiumBuild()) {
+    std::wstring diff_installer;
+    ASSERT_TRUE(GetInstaller(mini_installer_constants::kDiffInstallerPattern,
+                             &diff_installer));
+    printf("\nLatest differential installer name is %ls\n",
+           diff_installer.c_str());
+    std::wstring prev_full_installer;
+    ASSERT_TRUE(GetPreviousFullInstaller(diff_installer, &prev_full_installer));
+    printf("\nPrevious full installer name is %ls\n",
+           prev_full_installer.c_str());
+    InstallMiniInstaller(false, prev_full_installer);
+    std::wstring full_installer_value;
+    GetChromeVersionFromRegistry(&full_installer_value);
+    printf("\n\nPreparing to overinstall...\n");
+    InstallMiniInstaller(false, diff_installer);
+    std::wstring diff_installer_value;
+    GetChromeVersionFromRegistry(&diff_installer_value);
+    ASSERT_TRUE(VerifyDifferentialInstall(full_installer_value,
+                                         diff_installer_value, diff_installer));
+  }  else {
+    printf("\n\nThis test doesn't run on a chromium build\n");
+  }
 }
 
 // This method will get the diff installer file name and
@@ -76,12 +87,16 @@ bool ChromeMiniInstaller::VerifyDifferentialInstall(
 // This method will get the latest full installer from nightly location
 // and installs it.
 void ChromeMiniInstaller::InstallFullInstaller() {
-  std::wstring full_installer_file_name;
-  ASSERT_TRUE(GetInstaller(mini_installer_constants::kFullInstallerPattern,
-                           &full_installer_file_name));
-  printf("The latest full installer is %ls\n\n",
-         full_installer_file_name.c_str());
-  InstallMiniInstaller(false, full_installer_file_name);
+  if (!IsChromiumBuild()) {
+    std::wstring full_installer_file_name;
+    ASSERT_TRUE(GetInstaller(mini_installer_constants::kFullInstallerPattern,
+                             &full_installer_file_name));
+    printf("The latest full installer is %ls\n\n",
+           full_installer_file_name.c_str());
+    InstallMiniInstaller(false, full_installer_file_name);
+  } else {
+    printf("\n\nThis test doesn't run on a chromium build\n");
+  }
 }
 
 // Installs the Chrome mini-installer, checks the registry and shortcuts.
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.h b/chrome/test/mini_installer_test/chrome_mini_installer.h
index 322c5ac..071edc1 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.h
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.h
@@ -50,6 +50,9 @@ class ChromeMiniInstaller {
   // then over installs with diff installer.
   void InstallDifferentialInstaller();
 
+  // Installs chrome.
+  void Install();
+
   // Installs the latest full installer.
   void InstallFullInstaller();
 
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index 8713163..7879478 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -32,7 +32,7 @@ class MiniInstallTest : public testing::Test {
   };
 };
 
-TEST_F(MiniInstallTest, DISABLED_FullInstallerTest) {
+TEST_F(MiniInstallTest, FullInstallerTest) {
   ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
   installer.InstallFullInstaller();
 }
@@ -53,18 +53,16 @@ TEST_F(MiniInstallTest, MiniInstallerOverChromeMetaInstallerTest) {
   installer.OverInstall();
 }
 
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) {
+TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) {
   if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
     ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall);
-    installer.InstallMiniInstaller(false,
-        mini_installer_constants::kChromeMiniInstallerExecutable);
+    installer.Install();
   }
 }
 
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) {
+TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
   ChromeMiniInstaller installer(mini_installer_constants::kUserInstall);
-  installer.InstallMiniInstaller(false,
-      mini_installer_constants::kChromeMiniInstallerExecutable);
+  installer.Install();
 }
 
 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) {