From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Mon, 5 Jan 2015 12:51:21 +0000 (+0800)
Subject: test/bufferlist: For root, don't do permission operation for read_file
X-Git-Tag: v0.92~77^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3291%2Fhead;p=ceph.git

test/bufferlist: For root, don't do permission operation for read_file
case.

For root user, it meet those error:
    test/bufferlist.cc:1880: Failure
    Value of: bl.read_file("testfile", &error)
      Actual: 0
    Expected: -13
    test/bufferlist.cc:1884: Failure
    Value of: bl.length()
      Actual: 8
    Expected: (unsigned)4
    Which is: 4
    test/bufferlist.cc:1886: Failure
    Value of: actual
      Actual: "ABC
    ABC
    "
    Expected: "ABC\n"
    Which is: "ABC

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

diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc
index 1e11e6f1d28d..8f6a87524bcc 100644
--- a/src/test/bufferlist.cc
+++ b/src/test/bufferlist.cc
@@ -1877,7 +1877,8 @@ TEST(BufferList, read_file) {
   ::unlink("testfile");
   EXPECT_EQ(-ENOENT, bl.read_file("UNLIKELY", &error));
   EXPECT_EQ(0, ::system("echo ABC > testfile ; chmod 0 testfile"));
-  EXPECT_EQ(-EACCES, bl.read_file("testfile", &error));
+  if (getuid() != 0)
+    EXPECT_EQ(-EACCES, bl.read_file("testfile", &error));
   EXPECT_EQ(0, ::system("chmod +r testfile"));
   EXPECT_EQ(0, bl.read_file("testfile", &error));
   ::unlink("testfile");