chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: immediately sync to disk as soon as we receieve an EMERG/ALERT/CRIT message
[elogind.git]
/
src
/
test
/
test-unit-name.c
diff --git
a/src/test/test-unit-name.c
b/src/test/test-unit-name.c
index b1a4134f48add8de69adb237f14227b711b20f68..6776ef0857716b4e70418e9b8b0b9c9444913ec5 100644
(file)
--- a/
src/test/test-unit-name.c
+++ b/
src/test/test-unit-name.c
@@
-38,7
+38,7
@@
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
{ \
static void test_replacements(void) {
#define expect(pattern, repl, expected) \
{ \
-
char _cleanup_free_
*t = \
+
_cleanup_free_ char
*t = \
unit_name_replace_instance(pattern, repl); \
puts(t); \
assert(streq(t, expected)); \
unit_name_replace_instance(pattern, repl); \
puts(t); \
assert(streq(t, expected)); \
@@
-57,7
+57,7
@@
static void test_replacements(void) {
#undef expect
#define expect(path, suffix, expected) \
{ \
#undef expect
#define expect(path, suffix, expected) \
{ \
-
char _cleanup_free_
*k, *t = \
+
_cleanup_free_ char
*k, *t = \
unit_name_from_path(path, suffix); \
puts(t); \
k = unit_name_to_path(t); \
unit_name_from_path(path, suffix); \
puts(t); \
k = unit_name_to_path(t); \
@@
-75,7
+75,7
@@
static void test_replacements(void) {
#undef expect
#define expect(pattern, path, suffix, expected) \
{ \
#undef expect
#define expect(pattern, path, suffix, expected) \
{ \
-
char _cleanup_free_
*t = \
+
_cleanup_free_ char
*t = \
unit_name_from_path_instance(pattern, path, suffix); \
puts(t); \
assert(streq(t, expected)); \
unit_name_from_path_instance(pattern, path, suffix); \
puts(t); \
assert(streq(t, expected)); \
@@
-90,7
+90,7
@@
static void test_replacements(void) {
#undef expect
#define expect(pattern) \
{ \
#undef expect
#define expect(pattern) \
{ \
-
char _cleanup_free_
*k, *t; \
+
_cleanup_free_ char
*k, *t; \
assert_se(t = unit_name_mangle(pattern)); \
assert_se(k = unit_name_mangle(t)); \
puts(t); \
assert_se(t = unit_name_mangle(pattern)); \
assert_se(k = unit_name_mangle(t)); \
puts(t); \
@@
-108,11
+108,12
@@
static void test_replacements(void) {
#undef expect
}
#undef expect
}
-static
void
test_unit_printf(void) {
+static
int
test_unit_printf(void) {
Manager *m;
Unit *u, *u2;
Manager *m;
Unit *u, *u2;
+ int r;
-
char _cleanup_free_
*mid, *bid, *host, *root_uid;
+
_cleanup_free_ char
*mid, *bid, *host, *root_uid;
struct passwd *root;
assert_se((mid = specifier_machine_id('m', NULL, NULL)));
struct passwd *root;
assert_se((mid = specifier_machine_id('m', NULL, NULL)));
@@
-122,14
+123,23
@@
static void test_unit_printf(void) {
assert_se((root = getpwnam("root")));
assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0);
assert_se((root = getpwnam("root")));
assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0);
- assert_se(manager_new(SYSTEMD_SYSTEM, &m) == 0);
+ r = manager_new(SYSTEMD_USER, false, &m);
+ if (r == -EPERM || r == -EACCES) {
+ puts("manager_new: Permission denied. Skipping test.");
+ return EXIT_TEST_SKIP;
+ }
+ assert(r == 0);
#define expect(unit, pattern, expected) \
{ \
#define expect(unit, pattern, expected) \
{ \
- char _cleanup_free_ *t = \
+ char *e; \
+ _cleanup_free_ char *t = \
unit_full_printf(unit, pattern); \
unit_full_printf(unit, pattern); \
- printf("result: %s\n", t); \
- assert(streq(t, expected)); \
+ printf("result: %s\nexpect: %s\n", t, expected); \
+ if ((e = endswith(expected, "*"))) \
+ assert(strncmp(t, e, e-expected)); \
+ else \
+ assert(streq(t, expected)); \
}
assert_se(setenv("USER", "root", 1) == 0);
}
assert_se(setenv("USER", "root", 1) == 0);
@@
-154,11
+164,11
@@
static void test_unit_printf(void) {
expect(u, "%u", root->pw_name);
expect(u, "%U", root_uid);
expect(u, "%h", root->pw_dir);
expect(u, "%u", root->pw_name);
expect(u, "%U", root_uid);
expect(u, "%h", root->pw_dir);
- expect(u, "%s",
root->pw_shell
);
+ expect(u, "%s",
"/bin/sh"
);
expect(u, "%m", mid);
expect(u, "%b", bid);
expect(u, "%H", host);
expect(u, "%m", mid);
expect(u, "%b", bid);
expect(u, "%H", host);
- expect(u, "%t", "/run");
+ expect(u, "%t", "/run
/user/*
");
/* templated */
assert_se(u2 = unit_new(m, sizeof(Service)));
/* templated */
assert_se(u2 = unit_new(m, sizeof(Service)));
@@
-174,16
+184,18
@@
static void test_unit_printf(void) {
expect(u2, "%u", root->pw_name);
expect(u2, "%U", root_uid);
expect(u2, "%h", root->pw_dir);
expect(u2, "%u", root->pw_name);
expect(u2, "%U", root_uid);
expect(u2, "%h", root->pw_dir);
- expect(u2, "%s",
root->pw_shell
);
+ expect(u2, "%s",
"/bin/sh"
);
expect(u2, "%m", mid);
expect(u2, "%b", bid);
expect(u2, "%H", host);
expect(u2, "%m", mid);
expect(u2, "%b", bid);
expect(u2, "%H", host);
- expect(u2, "%t", "/run");
+ expect(u2, "%t", "/run/user/*");
+
+ manager_free(m);
+
+ return 0;
}
int main(int argc, char* argv[]) {
test_replacements();
}
int main(int argc, char* argv[]) {
test_replacements();
- test_unit_printf();
-
- return 0;
+ return test_unit_printf();
}
}