summaryrefslogtreecommitdiff
path: root/src/test/test-cgroup-util.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-12 02:09:32 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-12 02:11:00 +0100
commitdd513a5dbfa0d5f97084c7c8e475530a03cfd973 (patch)
tree0eb734e8ae4a8670e5a5119b79a06b5532817a6d /src/test/test-cgroup-util.c
parent923d8fd381bced1c2d90ca53d18629d61a0f454a (diff)
test: fix "make check"
Let's remove the tests for cg_path_get_machine_name(), since they no longer operate solely on the cgroup path, but actually look up data in /run. Since we have a test for cg_pid_get_machine_name() this shouldn't be too much of a loss.
Diffstat (limited to 'src/test/test-cgroup-util.c')
-rw-r--r--src/test/test-cgroup-util.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 12dcc17ddb..b37468b70e 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -122,21 +122,6 @@ static void test_path_get_owner_uid(void) {
check_p_g_o_u("", -ENOENT, 0);
}
-static void check_p_g_m_n(const char *path, int code, const char *result) {
- _cleanup_free_ char *m = NULL;
-
- assert_se(cg_path_get_machine_name(path, &m) == code);
- assert_se(streq_ptr(m, result));
-}
-
-static void test_path_get_machine_name(void) {
- check_p_g_m_n("/user.slice/machine-foobar.scope", 0, "foobar");
- check_p_g_m_n("/machine-foobar.scope", 0, "foobar");
- check_p_g_m_n("/user.slice/user-kuux.slice/machine-foobar.scope", 0, "foobar");
- check_p_g_m_n("/user.slice/user-kuux.slice/machine-foobar.scope/asjhdkj", 0, "foobar");
- check_p_g_m_n("", -ENOENT, NULL);
-}
-
static void test_get_paths(void) {
_cleanup_free_ char *a = NULL;
@@ -267,7 +252,6 @@ int main(void) {
test_path_get_user_unit();
test_path_get_session();
test_path_get_owner_uid();
- test_path_get_machine_name();
TEST_REQ_RUNNING_SYSTEMD(test_get_paths());
test_proc();
TEST_REQ_RUNNING_SYSTEMD(test_escape());