X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ftest%2Ftest-cgroup-util.c;h=9834a6a1302c2e84ec8ed36a311bdef1878598f8;hb=adfe5671ef794099068038dfccbf1eb5134433c8;hp=fda8bcc5c5f023641074daa18e15f7769c0bb836;hpb=de0671ee7fe465e108f62dcbbbe9366f81dd9e9a;p=elogind.git
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index fda8bcc5c..9834a6a13 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -19,7 +19,6 @@
along with systemd; If not, see .
***/
-#include
#include "util.h"
#include "cgroup-util.h"
@@ -93,6 +92,7 @@ static void test_path_get_user_unit(void) {
check_p_g_u_u("/meh.service", -ENOENT, NULL);
check_p_g_u_u("/session-3.scope/_cpu.service", 0, "cpu.service");
check_p_g_u_u("/user.slice/user-1000.slice/user@1000.service/server.service", 0, "server.service");
+ check_p_g_u_u("/user.slice/user-1000.slice/user@1000.service/foobar.slice/foobar@pie.service", 0, "foobar@pie.service");
check_p_g_u_u("/user.slice/user-1000.slice/user@.service/server.service", -ENOENT, NULL);
}
@@ -106,7 +106,8 @@ static void check_p_g_s(const char *path, int code, const char *result) {
static void test_path_get_session(void) {
check_p_g_s("/user.slice/user-1000.slice/session-2.scope/foobar.service", 0, "2");
check_p_g_s("/session-3.scope", 0, "3");
- check_p_g_s("", -ENOENT, 0);
+ check_p_g_s("/session-.scope", -ENOENT, NULL);
+ check_p_g_s("", -ENOENT, NULL);
}
static void check_p_g_o_u(const char *path, int code, uid_t result) {
@@ -140,7 +141,7 @@ static void test_proc(void) {
FOREACH_DIRENT(de, d, break) {
_cleanup_free_ char *path = NULL, *path_shifted = NULL, *session = NULL, *unit = NULL, *user_unit = NULL, *machine = NULL, *slice = NULL;
pid_t pid;
- uid_t uid = (uid_t) -1;
+ uid_t uid = UID_INVALID;
if (de->d_type != DT_DIR &&
de->d_type != DT_UNKNOWN)