update_engine: Remove xattr checks
It seems like the builders support xattr, otherwise some unittests like
P2PDownloadActionTest should've been failed. Although, this is in conterary with
crbug.com/817524. Since they haven't failed it means we can remove the checks
for xattrs support in some of the unittests.
BUG=none
TEST=precq
TEST=unittests
Change-Id: I81fa96d21ae06ee2f832c1c3063fc78229238b35
Reviewed-on: https://chromium-review.googlesource.com/1171189
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Sen Jiang <senj@chromium.org>
diff --git a/common/test_utils.cc b/common/test_utils.cc
index 85f78f9..04f55d0 100644
--- a/common/test_utils.cc
+++ b/common/test_utils.cc
@@ -28,7 +28,6 @@
#include <sys/stat.h>
#include <sys/sysmacros.h>
#include <sys/types.h>
-#include <sys/xattr.h>
#include <unistd.h>
#include <set>
@@ -112,36 +111,6 @@
return string(buf.begin(), buf.begin() + r);
}
-bool IsXAttrSupported(const base::FilePath& dir_path) {
- char *path = strdup(dir_path.Append("xattr_test_XXXXXX").value().c_str());
-
- int fd = mkstemp(path);
- if (fd == -1) {
- PLOG(ERROR) << "Error creating temporary file in " << dir_path.value();
- free(path);
- return false;
- }
-
- if (unlink(path) != 0) {
- PLOG(ERROR) << "Error unlinking temporary file " << path;
- close(fd);
- free(path);
- return false;
- }
-
- int xattr_res = fsetxattr(fd, "user.xattr-test", "value", strlen("value"), 0);
- if (xattr_res != 0) {
- if (errno == ENOTSUP) {
- // Leave it to call-sites to warn about non-support.
- } else {
- PLOG(ERROR) << "Error setting xattr on " << path;
- }
- }
- close(fd);
- free(path);
- return xattr_res == 0;
-}
-
bool WriteFileVector(const string& path, const brillo::Blob& data) {
return utils::WriteFile(path.c_str(), data.data(), data.size());
}
diff --git a/common/test_utils.h b/common/test_utils.h
index ddb3d34..ffe6f67 100644
--- a/common/test_utils.h
+++ b/common/test_utils.h
@@ -95,11 +95,6 @@
// Reads a symlink from disk. Returns empty string on failure.
std::string Readlink(const std::string& path);
-// Checks if xattr is supported in the directory specified by
-// |dir_path| which must be writable. Returns true if the feature is
-// supported, false if not or if an error occurred.
-bool IsXAttrSupported(const base::FilePath& dir_path);
-
void FillWithData(brillo::Blob* buffer);
// Compare the value of native array for download source parameter.
diff --git a/p2p_manager_unittest.cc b/p2p_manager_unittest.cc
index 01bdc35..02fd17b 100644
--- a/p2p_manager_unittest.cc
+++ b/p2p_manager_unittest.cc
@@ -340,11 +340,6 @@
// Check that sharing a *new* file works.
TEST_F(P2PManagerTest, ShareFile) {
- if (!test_utils::IsXAttrSupported(base::FilePath("/tmp"))) {
- LOG(WARNING) << "Skipping test because /tmp does not support xattr. "
- << "Please update your system to support this feature.";
- return;
- }
const int kP2PTestFileSize = 1000 * 1000; // 1 MB
EXPECT_TRUE(manager_->FileShare("foo", kP2PTestFileSize));
@@ -362,11 +357,6 @@
// Check that making a shared file visible, does what is expected.
TEST_F(P2PManagerTest, MakeFileVisible) {
- if (!test_utils::IsXAttrSupported(base::FilePath("/tmp"))) {
- LOG(WARNING) << "Skipping test because /tmp does not support xattr. "
- << "Please update your system to support this feature.";
- return;
- }
const int kP2PTestFileSize = 1000 * 1000; // 1 MB
// First, check that it's not visible.
@@ -388,12 +378,6 @@
// Check that we return the right values for existing files in P2P_DIR.
TEST_F(P2PManagerTest, ExistingFiles) {
- if (!test_utils::IsXAttrSupported(base::FilePath("/tmp"))) {
- LOG(WARNING) << "Skipping test because /tmp does not support xattr. "
- << "Please update your system to support this feature.";
- return;
- }
-
bool visible;
// Check that errors are returned if the file does not exist
diff --git a/payload_consumer/download_action_unittest.cc b/payload_consumer/download_action_unittest.cc
index 6d2a9f0..8efcd8e 100644
--- a/payload_consumer/download_action_unittest.cc
+++ b/payload_consumer/download_action_unittest.cc
@@ -624,12 +624,6 @@
};
TEST_F(P2PDownloadActionTest, IsWrittenTo) {
- if (!test_utils::IsXAttrSupported(FilePath("/tmp"))) {
- LOG(WARNING) << "Skipping test because /tmp does not support xattr. "
- << "Please update your system to support this feature.";
- return;
- }
-
SetupDownload(0); // starting_offset
StartDownload(true); // use_p2p_to_share
@@ -647,12 +641,6 @@
}
TEST_F(P2PDownloadActionTest, DeleteIfHoleExists) {
- if (!test_utils::IsXAttrSupported(FilePath("/tmp"))) {
- LOG(WARNING) << "Skipping test because /tmp does not support xattr. "
- << "Please update your system to support this feature.";
- return;
- }
-
SetupDownload(1000); // starting_offset
StartDownload(true); // use_p2p_to_share
@@ -663,12 +651,6 @@
}
TEST_F(P2PDownloadActionTest, CanAppend) {
- if (!test_utils::IsXAttrSupported(FilePath("/tmp"))) {
- LOG(WARNING) << "Skipping test because /tmp does not support xattr. "
- << "Please update your system to support this feature.";
- return;
- }
-
SetupDownload(1000); // starting_offset
// Prepare the file with existing data before starting to write to
@@ -701,12 +683,6 @@
}
TEST_F(P2PDownloadActionTest, DeletePartialP2PFileIfResumingWithoutP2P) {
- if (!test_utils::IsXAttrSupported(FilePath("/tmp"))) {
- LOG(WARNING) << "Skipping test because /tmp does not support xattr. "
- << "Please update your system to support this feature.";
- return;
- }
-
SetupDownload(1000); // starting_offset
// Prepare the file with all existing data before starting to write