]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/bufferlist: For root, don't do permission operation for read_file 3291/head
authorJianpeng Ma <jianpeng.ma@intel.com>
Mon, 5 Jan 2015 12:51:21 +0000 (20:51 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Mon, 5 Jan 2015 12:51:21 +0000 (20:51 +0800)
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>
src/test/bufferlist.cc

index 1e11e6f1d28d3ea4e4bb91f0f9e925813f78905d..8f6a87524bcc1ea56c9702321cde7146d38a007a 100644 (file)
@@ -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");