Commit fbfb1032 authored by Joel Hockey's avatar Joel Hockey Committed by Commit Bot

Revert "Try and debug flakes in ExtractMountNameFileSystemNameFullPath tests"

This reverts commit 94aaefbb.

Reason for revert: Not helping to detect flakes

Original change's description:
> Try and debug flakes in ExtractMountNameFileSystemNameFullPath tests
> 
> Bug: 942371
> Change-Id: I8364196af047263086580c11e7db5188ac6915bb
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1530317
> Commit-Queue: Joel Hockey <joelhockey@chromium.org>
> Commit-Queue: Sam McNally <sammc@chromium.org>
> Auto-Submit: Joel Hockey <joelhockey@chromium.org>
> Reviewed-by: Sam McNally <sammc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#641839}

TBR=fukino@chromium.org,sammc@chromium.org,joelhockey@chromium.org

Change-Id: I549986343c7764e044c179abb9bdda807973c241
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 942371
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1531883Reviewed-by: default avatarJoel Hockey <joelhockey@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#642389}
parent 1487e4c7
...@@ -591,13 +591,13 @@ TEST_F(FileManagerPathUtilTest, ExtractMountNameFileSystemNameFullPath) { ...@@ -591,13 +591,13 @@ TEST_F(FileManagerPathUtilTest, ExtractMountNameFileSystemNameFullPath) {
storage::ExternalMountPoints::GetSystemInstance(); storage::ExternalMountPoints::GetSystemInstance();
std::string downloads_mount_name = GetDownloadsMountPointName(profile_.get()); std::string downloads_mount_name = GetDownloadsMountPointName(profile_.get());
base::FilePath downloads = GetDownloadsFolderForProfile(profile_.get()); base::FilePath downloads = GetDownloadsFolderForProfile(profile_.get());
EXPECT_TRUE(mount_points->RegisterFileSystem( mount_points->RegisterFileSystem(downloads_mount_name,
downloads_mount_name, storage::kFileSystemTypeNativeLocal, storage::kFileSystemTypeNativeLocal,
storage::FileSystemMountOption(), downloads)); storage::FileSystemMountOption(), downloads);
base::FilePath removable = base::FilePath(kRemovableMediaPath); base::FilePath removable = base::FilePath(kRemovableMediaPath);
EXPECT_TRUE(mount_points->RegisterFileSystem( mount_points->RegisterFileSystem(
chromeos::kSystemMountNameRemovable, storage::kFileSystemTypeNativeLocal, chromeos::kSystemMountNameRemovable, storage::kFileSystemTypeNativeLocal,
storage::FileSystemMountOption(), base::FilePath(kRemovableMediaPath))); storage::FileSystemMountOption(), base::FilePath(kRemovableMediaPath));
std::string relative_path_1 = "foo"; std::string relative_path_1 = "foo";
std::string relative_path_2 = "foo/bar"; std::string relative_path_2 = "foo/bar";
std::string mount_name; std::string mount_name;
...@@ -632,12 +632,9 @@ TEST_F(FileManagerPathUtilTest, ExtractMountNameFileSystemNameFullPath) { ...@@ -632,12 +632,9 @@ TEST_F(FileManagerPathUtilTest, ExtractMountNameFileSystemNameFullPath) {
removable, &mount_name, &file_system_name, &full_path)); removable, &mount_name, &file_system_name, &full_path));
// <removable>/foo/ // <removable>/foo/
// TODO(crbug.com/942371): Extra debugging to detect what is causing flakes.
base::FilePath absolute_path = removable.Append(relative_path_1);
base::FilePath virtual_path;
EXPECT_TRUE(mount_points->GetVirtualPath(absolute_path, &virtual_path));
EXPECT_TRUE(ExtractMountNameFileSystemNameFullPath( EXPECT_TRUE(ExtractMountNameFileSystemNameFullPath(
absolute_path, &mount_name, &file_system_name, &full_path)); removable.Append(relative_path_1), &mount_name, &file_system_name,
&full_path));
EXPECT_EQ(mount_name, "removable/foo"); EXPECT_EQ(mount_name, "removable/foo");
EXPECT_EQ(file_system_name, "foo"); EXPECT_EQ(file_system_name, "foo");
EXPECT_EQ(full_path, "/"); EXPECT_EQ(full_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