From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Tue, 6 Jan 2015 08:23:40 +0000 (+0800)
Subject: TestLFNIndex.cc: For root, dont do permission operations.
X-Git-Tag: v0.92~65^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea3ed5bbf0285bf2dfff74a1e533af2f6637cd1d;p=ceph.git

TestLFNIndex.cc: For root, dont do permission operations.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/test/os/TestLFNIndex.cc b/src/test/os/TestLFNIndex.cc
index 3bc5ba01666f..fcbb7fe333d4 100644
--- a/src/test/os/TestLFNIndex.cc
+++ b/src/test/os/TestLFNIndex.cc
@@ -207,7 +207,8 @@ TEST_F(TestLFNIndex, remove_object) {
     ghobject_t hoid(hobject_t(sobject_t("ABC", CEPH_NOSNAP)));
 
     EXPECT_EQ(0, ::chmod("PATH", 0000));
-    EXPECT_EQ(-EACCES, remove_object(path, hoid));
+    if (getuid() != 0)
+      EXPECT_EQ(-EACCES, remove_object(path, hoid));
     EXPECT_EQ(0, ::chmod("PATH", 0700));
     EXPECT_EQ(-ENOENT, remove_object(path, hoid));
     EXPECT_EQ(0, get_mangled_name(path, hoid, &mangled_name, &exists));
@@ -398,7 +399,8 @@ TEST_F(TestLFNIndex, get_mangled_name) {
     exists = 666;
     EXPECT_EQ(0, ::close(::creat(pathname.c_str(), 0600)));
     EXPECT_EQ(0, ::chmod("PATH", 0500));
-    EXPECT_EQ(-EACCES, get_mangled_name(path, hoid, &mangled_name, &exists));
+    if (getuid() != 0)
+      EXPECT_EQ(-EACCES, get_mangled_name(path, hoid, &mangled_name, &exists));
     EXPECT_EQ("", mangled_name);
     EXPECT_EQ(666, exists);
     EXPECT_EQ(0, ::chmod("PATH", 0700));