Check and clean plist status in updater integration test.
Change DeletePlist to return true if the plist does not exist. Looking
through the call sites, this seems to be more correct with their
assumptions.
Bug: 1062288
Change-Id: I5d3a7cbe77620de93a5e1378862b4786c7a840ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2111903
Commit-Queue: Robert Sesek <[email protected]>
Reviewed-by: Robert Sesek <[email protected]>
Auto-Submit: Joshua Pawlicki <[email protected]>
Cr-Commit-Position: refs/heads/master@{#752141}
diff --git a/chrome/updater/test/integration_tests_mac.mm b/chrome/updater/test/integration_tests_mac.mm
new file mode 100644
index 0000000..85fc865b
--- /dev/null
+++ b/chrome/updater/test/integration_tests_mac.mm
@@ -0,0 +1,111 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/mac/foundation_util.h"
+#include "base/path_service.h"
+#include "base/process/launch.h"
+#include "base/process/process.h"
+#include "chrome/common/mac/launchd.h"
+#include "chrome/updater/mac/xpc_service_names.h"
+#include "chrome/updater/updater_version.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace updater {
+
+namespace test {
+
+namespace {
+
+base::FilePath GetExecutablePath() {
+ base::FilePath test_executable;
+ if (!base::PathService::Get(base::FILE_EXE, &test_executable))
+ return base::FilePath();
+ return test_executable.DirName()
+ .Append(FILE_PATH_LITERAL(PRODUCT_FULLNAME_STRING ".App"))
+ .Append(FILE_PATH_LITERAL("Contents"))
+ .Append(FILE_PATH_LITERAL("MacOS"))
+ .Append(FILE_PATH_LITERAL(PRODUCT_FULLNAME_STRING));
+}
+
+base::FilePath GetInstallerPath() {
+ base::FilePath test_executable;
+ if (!base::PathService::Get(base::FILE_EXE, &test_executable))
+ return base::FilePath();
+ return test_executable.DirName().Append("updater_setup");
+}
+
+base::FilePath GetProductPath() {
+ return base::mac::GetUserLibraryPath()
+ .AppendASCII(COMPANY_SHORTNAME_STRING)
+ .AppendASCII(PRODUCT_FULLNAME_STRING);
+}
+
+bool Run(base::CommandLine command_line, int* exit_code) {
+ auto process = base::LaunchProcess(command_line, {});
+ if (!process.IsValid())
+ return false;
+ if (!process.WaitForExitWithTimeout(base::TimeDelta::FromSeconds(60),
+ exit_code))
+ return false;
+ return true;
+}
+
+} // namespace
+
+void Clean() {
+ EXPECT_TRUE(base::DeleteFile(GetProductPath(), true));
+ EXPECT_TRUE(Launchd::GetInstance()->DeletePlist(
+ Launchd::User, Launchd::Agent,
+ updater::CopyGoogleUpdateCheckLaunchDName()));
+ EXPECT_TRUE(Launchd::GetInstance()->DeletePlist(
+ Launchd::User, Launchd::Agent,
+ updater::CopyGoogleUpdateCheckLaunchDName()));
+}
+
+void ExpectClean() {
+ // Files must not exist on the file system.
+ EXPECT_FALSE(base::PathExists(GetProductPath()));
+ EXPECT_FALSE(Launchd::GetInstance()->PlistExists(
+ Launchd::User, Launchd::Agent,
+ updater::CopyGoogleUpdateCheckLaunchDName()));
+ EXPECT_FALSE(Launchd::GetInstance()->PlistExists(
+ Launchd::User, Launchd::Agent,
+ updater::CopyGoogleUpdateCheckLaunchDName()));
+}
+
+void ExpectInstalled() {
+ // Files must exist on the file system.
+ EXPECT_TRUE(base::PathExists(GetProductPath()));
+ EXPECT_TRUE(Launchd::GetInstance()->PlistExists(
+ Launchd::User, Launchd::Agent,
+ updater::CopyGoogleUpdateCheckLaunchDName()));
+ EXPECT_TRUE(Launchd::GetInstance()->PlistExists(
+ Launchd::User, Launchd::Agent,
+ updater::CopyGoogleUpdateCheckLaunchDName()));
+}
+
+void Install() {
+ base::FilePath path = GetInstallerPath();
+ ASSERT_FALSE(path.empty());
+ int exit_code = -1;
+ ASSERT_TRUE(Run(base::CommandLine(path), &exit_code));
+ EXPECT_EQ(0, exit_code);
+}
+
+void Uninstall() {
+ base::FilePath path = GetExecutablePath();
+ ASSERT_FALSE(path.empty());
+ base::CommandLine command_line(path);
+ command_line.AppendSwitch("uninstall");
+ int exit_code = -1;
+ ASSERT_TRUE(Run(command_line, &exit_code));
+ EXPECT_EQ(0, exit_code);
+}
+
+} // namespace test
+
+} // namespace updater
