picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: move xattr-util related tests to test-xattr-util.c

This commit is contained in:
Ronny Chevalier 2016-03-03 00:35:36 +01:00
parent 6a4f4a0fa0
commit ac229ed890
4 changed files with 77 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -284,6 +284,7 @@
/test-verbs
/test-watchdog
/test-web-util
/test-xattr-util
/test-xml
/timedatectl
/udevadm

7
Makefile.am
View File

@ -1433,6 +1433,7 @@ tests += \
test-proc-cmdline \
test-io-util \
test-glob-util \
test-xattr-util \
test-fs-util \
test-web-util \
test-stat-util \
@ -1778,6 +1779,12 @@ test_alloc_util_SOURCES = \
test_alloc_util_LDADD = \
libbasic.la
test_xattr_util_SOURCES = \
src/test/test-xattr-util.c
test_xattr_util_LDADD = \
libbasic.la
test_io_util_SOURCES = \
src/test/test-io-util.c

34
src/test/test-util.c
View File

@ -41,7 +41,6 @@
#include "strv.h"
#include "util.h"
#include "virt.h"
#include "xattr-util.h"
static void test_align_power2(void) {
unsigned long i, p2;
@ -275,38 +274,6 @@ static void test_raw_clone(void) {
}
}
static void test_fgetxattrat_fake(void) {
char t[] = "/var/tmp/xattrtestXXXXXX";
_cleanup_close_ int fd = -1;
const char *x;
char v[3] = {};
int r;
assert_se(mkdtemp(t));
x = strjoina(t, "/test");
assert_se(touch(x) >= 0);
r = setxattr(x, "user.foo", "bar", 3, 0);
if (r < 0 && errno == EOPNOTSUPP) /* no xattrs supported on /var/tmp... */
goto cleanup;
assert_se(r >= 0);
fd = open(t, O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOCTTY);
assert_se(fd >= 0);
assert_se(fgetxattrat_fake(fd, "test", "user.foo", v, 3, 0) >= 0);
assert_se(memcmp(v, "bar", 3) == 0);
safe_close(fd);
fd = open("/", O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOCTTY);
assert_se(fd >= 0);
assert_se(fgetxattrat_fake(fd, "usr", "user.idontexist", v, 3, 0) == -ENODATA);
cleanup:
assert_se(unlink(x) >= 0);
assert_se(rmdir(t) >= 0);
}
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
@ -321,7 +288,6 @@ int main(int argc, char *argv[]) {
test_log2i();
test_execute_directory();
test_raw_clone();
test_fgetxattrat_fake();
return 0;
}

69
src/test/test-xattr-util.c Normal file
View File

@ -0,0 +1,69 @@
/***
This file is part of systemd.
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/xattr.h>
#include <unistd.h>
#include "alloc-util.h"
#include "fd-util.h"
#include "fs-util.h"
#include "macro.h"
#include "string-util.h"
#include "xattr-util.h"
static void test_fgetxattrat_fake(void) {
char t[] = "/var/tmp/xattrtestXXXXXX";
_cleanup_close_ int fd = -1;
const char *x;
char v[3] = {};
int r;
assert_se(mkdtemp(t));
x = strjoina(t, "/test");
assert_se(touch(x) >= 0);
r = setxattr(x, "user.foo", "bar", 3, 0);
if (r < 0 && errno == EOPNOTSUPP) /* no xattrs supported on /var/tmp... */
goto cleanup;
assert_se(r >= 0);
fd = open(t, O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOCTTY);
assert_se(fd >= 0);
assert_se(fgetxattrat_fake(fd, "test", "user.foo", v, 3, 0) >= 0);
assert_se(memcmp(v, "bar", 3) == 0);
safe_close(fd);
fd = open("/", O_RDONLY|O_DIRECTORY|O_CLOEXEC|O_NOCTTY);
assert_se(fd >= 0);
assert_se(fgetxattrat_fake(fd, "usr", "user.idontexist", v, 3, 0) == -ENODATA);
cleanup:
assert_se(unlink(x) >= 0);
assert_se(rmdir(t) >= 0);
}
int main(void) {
test_fgetxattrat_fake();
return 0;
}