Commit c3cf6485 authored by jackhou's avatar jackhou Committed by Commit bot

Disable app_mode_chrome_locator_browsertest.mm on official builds.

The test assumes the "Google Chrome.app" bundle is in the same directory
as the browser_tests binary. It probably isn't on the official builders.

Disable these until we have a workaround.

TBR=tapted@chromium.org, rsesek@chromium.org

BUG=409615

Review URL: https://codereview.chromium.org/532173002

Cr-Commit-Position: refs/heads/master@{#293101}
parent c171298e
...@@ -43,7 +43,29 @@ TEST(ChromeLocatorTest, FindNonExistentBundle) { ...@@ -43,7 +43,29 @@ TEST(ChromeLocatorTest, FindNonExistentBundle) {
EXPECT_FALSE(app_mode::FindBundleById(@"this.doesnt.exist", &dummy)); EXPECT_FALSE(app_mode::FindBundleById(@"this.doesnt.exist", &dummy));
} }
TEST(ChromeLocatorTest, GetNonExistentBundleInfo) { // GetChromeBundlePath doesn't work on official builds. Disable them until it's
// fixed. http://crbug.com/409615
#if defined(OFFICIAL_BUILD)
#define MAYBE_GetNonExistentBundleInfo DISABLED_GetNonExistentBundleInfo
#define MAYBE_GetChromeBundleInfo DISABLED_GetChromeBundleInfo
#define MAYBE_GetChromeBundleInfoWithLatestVersion \
DISABLED_GetChromeBundleInfoWithLatestVersion
#define MAYBE_GetChromeBundleInfoWithInvalidVersion \
DISABLED_GetChromeBundleInfoWithInvalidVersion
#define MAYBE_GetChromeBundleInfoWithPreviousVersion \
DISABLED_GetChromeBundleInfoWithPreviousVersion
#else
#define MAYBE_GetNonExistentBundleInfo GetNonExistentBundleInfo
#define MAYBE_GetChromeBundleInfo GetChromeBundleInfo
#define MAYBE_GetChromeBundleInfoWithLatestVersion \
GetChromeBundleInfoWithLatestVersion
#define MAYBE_GetChromeBundleInfoWithInvalidVersion \
GetChromeBundleInfoWithInvalidVersion
#define MAYBE_GetChromeBundleInfoWithPreviousVersion \
GetChromeBundleInfoWithPreviousVersion
#endif
TEST(ChromeLocatorTest, MAYBE_GetNonExistentBundleInfo) {
base::ScopedTempDir temp_dir; base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
...@@ -57,7 +79,7 @@ TEST(ChromeLocatorTest, GetNonExistentBundleInfo) { ...@@ -57,7 +79,7 @@ TEST(ChromeLocatorTest, GetNonExistentBundleInfo) {
&framework_path)); &framework_path));
} }
TEST(ChromeLocatorTest, GetChromeBundleInfo) { TEST(ChromeLocatorTest, MAYBE_GetChromeBundleInfo) {
base::FilePath chrome_bundle_path; base::FilePath chrome_bundle_path;
GetChromeBundlePath(&chrome_bundle_path); GetChromeBundlePath(&chrome_bundle_path);
ASSERT_TRUE(base::DirectoryExists(chrome_bundle_path)); ASSERT_TRUE(base::DirectoryExists(chrome_bundle_path));
...@@ -75,7 +97,7 @@ TEST(ChromeLocatorTest, GetChromeBundleInfo) { ...@@ -75,7 +97,7 @@ TEST(ChromeLocatorTest, GetChromeBundleInfo) {
EXPECT_TRUE(base::PathExists(framework_path)); EXPECT_TRUE(base::PathExists(framework_path));
} }
TEST(ChromeLocatorTest, GetChromeBundleInfoWithLatestVersion) { TEST(ChromeLocatorTest, MAYBE_GetChromeBundleInfoWithLatestVersion) {
base::FilePath chrome_bundle_path; base::FilePath chrome_bundle_path;
GetChromeBundlePath(&chrome_bundle_path); GetChromeBundlePath(&chrome_bundle_path);
ASSERT_TRUE(base::DirectoryExists(chrome_bundle_path)); ASSERT_TRUE(base::DirectoryExists(chrome_bundle_path));
...@@ -93,7 +115,7 @@ TEST(ChromeLocatorTest, GetChromeBundleInfoWithLatestVersion) { ...@@ -93,7 +115,7 @@ TEST(ChromeLocatorTest, GetChromeBundleInfoWithLatestVersion) {
EXPECT_TRUE(base::PathExists(framework_path)); EXPECT_TRUE(base::PathExists(framework_path));
} }
TEST(ChromeLocatorTest, GetChromeBundleInfoWithInvalidVersion) { TEST(ChromeLocatorTest, MAYBE_GetChromeBundleInfoWithInvalidVersion) {
base::FilePath chrome_bundle_path; base::FilePath chrome_bundle_path;
GetChromeBundlePath(&chrome_bundle_path); GetChromeBundlePath(&chrome_bundle_path);
ASSERT_TRUE(base::DirectoryExists(chrome_bundle_path)); ASSERT_TRUE(base::DirectoryExists(chrome_bundle_path));
...@@ -112,7 +134,7 @@ TEST(ChromeLocatorTest, GetChromeBundleInfoWithInvalidVersion) { ...@@ -112,7 +134,7 @@ TEST(ChromeLocatorTest, GetChromeBundleInfoWithInvalidVersion) {
EXPECT_TRUE(base::PathExists(framework_path)); EXPECT_TRUE(base::PathExists(framework_path));
} }
TEST(ChromeLocatorTest, GetChromeBundleInfoWithPreviousVersion) { TEST(ChromeLocatorTest, MAYBE_GetChromeBundleInfoWithPreviousVersion) {
base::FilePath chrome_bundle_path; base::FilePath chrome_bundle_path;
GetChromeBundlePath(&chrome_bundle_path); GetChromeBundlePath(&chrome_bundle_path);
ASSERT_TRUE(base::DirectoryExists(chrome_bundle_path)); ASSERT_TRUE(base::DirectoryExists(chrome_bundle_path));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment