Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
test/libcephfs: ensure that we set the mode of the libcephfs root bef…
…ore testing Patrick noticed that the libcephfs tests failed to run unless they were run after the ceph-fuse tests had run. The ceph-fuse tests set the root of the share to mode 01777, but the libcephfs tests don't do that even though they rely on the directory being world-writable. Fix this by adding a new main() function for ceph_test_libcephfs, and calling a function (copied from access.cc) that resets the permissions of the root before running the tests. Fixes: http://tracker.ceph.com/issues/18013 Signed-off-by: Jeff Layton <jlayton@redhat.com>
- Loading branch information
Showing
2 changed files
with
63 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- | ||
// vim: ts=8 sw=2 smarttab | ||
/* | ||
* Ceph - scalable distributed file system | ||
* | ||
* Copyright (C) 2011 New Dream Network | ||
* Copyright (C) 2016 Red Hat | ||
* | ||
* This is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU Lesser General Public | ||
* License version 2.1, as published by the Free Software | ||
* Foundation. See file COPYING. | ||
* | ||
*/ | ||
|
||
#include "gtest/gtest.h" | ||
#include "include/cephfs/libcephfs.h" | ||
#include "include/stat.h" | ||
#include <errno.h> | ||
#include <fcntl.h> | ||
#include <unistd.h> | ||
#include <sys/types.h> | ||
#include <sys/stat.h> | ||
#include <dirent.h> | ||
#include <sys/xattr.h> | ||
#include <sys/uio.h> | ||
|
||
#ifdef __linux__ | ||
#include <limits.h> | ||
#endif | ||
|
||
static int update_root_mode() | ||
{ | ||
struct ceph_mount_info *admin; | ||
int r = ceph_create(&admin, NULL); | ||
if (r < 0) | ||
return r; | ||
ceph_conf_read_file(admin, NULL); | ||
ceph_conf_parse_env(admin, NULL); | ||
ceph_conf_set(admin, "client_permissions", "false"); | ||
r = ceph_mount(admin, "/"); | ||
if (r < 0) | ||
goto out; | ||
r = ceph_chmod(admin, "/", 01777); | ||
out: | ||
ceph_shutdown(admin); | ||
return r; | ||
} | ||
|
||
|
||
int main(int argc, char **argv) | ||
{ | ||
int r = update_root_mode(); | ||
if (r < 0) | ||
exit(1); | ||
|
||
::testing::InitGoogleTest(&argc, argv); | ||
|
||
srand(getpid()); | ||
|
||
return RUN_ALL_TESTS(); | ||
} |