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

test-user-util: skip most tests for nobody if synthentization is off

Browse source 
When synthetisation is turned off, there's just too many ways those tests can
go wrong. We are not interested in verifying that the db on disk is correct,
let's just skip all checks.

In the first version of this patch, I recorded if we detected a mismatch during
configuration and only skipped tests in that case, but actually it is possible
to change the host configuration between our configuration phase and running
of the tests. It's just more robust to skip always. (This is particularly true
if tests are installed.)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-02-20 17:13:41 +01:00
parent 52c6e6a8a0
commit 7559b2da10
1 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/test/test-user-util.c
View file

@ -32,6 +32,10 @@ static void test_uid_to_name_one(uid_t uid, const char *name) {
log_info("/* %s("UID_FMT", \"%s\") */", __func__, uid, name);
assert_se(t = uid_to_name(uid));
if (!synthesize_nobody() && streq(name, NOBODY_USER_NAME)) {
log_info("(skipping detailed tests because nobody is not synthesized)");
return;
}
assert_se(streq_ptr(t, name));
}
@ -41,6 +45,10 @@ static void test_gid_to_name_one(gid_t gid, const char *name) {
log_info("/* %s("GID_FMT", \"%s\") */", __func__, gid, name);
assert_se(t = gid_to_name(gid));
if (!synthesize_nobody() && streq(name, NOBODY_GROUP_NAME)) {
log_info("(skipping detailed tests because nobody is not synthesized)");
return;
}
assert_se(streq_ptr(t, name));
}
@ -160,17 +168,23 @@ static void test_valid_home(void) {
}
static void test_get_user_creds_one(const char *id, const char *name, uid_t uid, gid_t gid, const char *home, const char *shell) {
const char *rhome;
const char *rshell;
uid_t ruid;
gid_t rgid;
const char *rhome = NULL;
const char *rshell = NULL;
uid_t ruid = UID_INVALID;
gid_t rgid = GID_INVALID;
int r;
log_info("/* %s(\"%s\", \"%s\", "UID_FMT", "GID_FMT", \"%s\", \"%s\") */",
__func__, id, name, uid, gid, home, shell);
assert_se(get_user_creds(&id, &ruid, &rgid, &rhome, &rshell) >= 0);
log_info("got \"%s\", "UID_FMT", "GID_FMT", \"%s\", \"%s\"",
id, ruid, rgid, rhome, rshell);
r = get_user_creds(&id, &ruid, &rgid, &rhome, &rshell);
log_info_errno(r, "got \"%s\", "UID_FMT", "GID_FMT", \"%s\", \"%s\": %m",
id, ruid, rgid, strnull(rhome), strnull(rshell));
if (!synthesize_nobody() && streq(name, NOBODY_USER_NAME)) {
log_info("(skipping detailed tests because nobody is not synthesized)");
return;
}
assert_se(r == 0);
assert_se(streq_ptr(id, name));
assert_se(ruid == uid);
assert_se(rgid == gid);
@ -179,12 +193,18 @@ static void test_get_user_creds_one(const char *id, const char *name, uid_t uid,
}
static void test_get_group_creds_one(const char *id, const char *name, gid_t gid) {
gid_t rgid;
gid_t rgid = GID_INVALID;
int r;
log_info("/* %s(\"%s\", \"%s\", "GID_FMT") */", __func__, id, name, gid);
assert_se(get_group_creds(&id, &rgid) >= 0);
log_info("got \"%s\", "GID_FMT, id, rgid);
r = get_group_creds(&id, &rgid);
log_info_errno(r, "got \"%s\", "GID_FMT": %m", id, rgid);
if (!synthesize_nobody() && streq(name, NOBODY_GROUP_NAME)) {
log_info("(skipping detailed tests because nobody is not synthesized)");
return;
}
assert_se(r == 0);
assert_se(streq_ptr(id, name));
assert_se(rgid == gid);
}