mirror of
https://github.com/systemd/systemd.git
synced 2024-12-25 01:34:28 +03:00
Merge pull request #16632 from keszybz/test-path-yet-again
Tighten handling of spawned services in tests that may fail
This commit is contained in:
commit
d975310342
@ -207,7 +207,7 @@ if dbus_docs.length() > 0
|
||||
'@INPUT@'],
|
||||
input : dbus_docs)
|
||||
|
||||
if conf.get('DEVELOPER_MODE') == 1
|
||||
if conf.get('BUILD_MODE') == 'BUILD_MODE_DEVELOPER'
|
||||
test('dbus-docs-fresh',
|
||||
update_dbus_docs_py,
|
||||
args : ['--build-dir=@0@'.format(project_build_root),
|
||||
|
@ -38,8 +38,8 @@ relative_source_path = run_command('realpath',
|
||||
project_source_root).stdout().strip()
|
||||
conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path)
|
||||
|
||||
conf.set10('DEVELOPER_MODE', get_option('mode') == 'developer',
|
||||
description : 'enable additional checks only suitable in development')
|
||||
conf.set('BUILD_MODE', 'BUILD_MODE_' + get_option('mode').to_upper(),
|
||||
description : 'tailor build to development or release builds')
|
||||
|
||||
want_ossfuzz = get_option('oss-fuzz')
|
||||
want_libfuzzer = get_option('llvm-fuzz')
|
||||
|
@ -5,7 +5,7 @@ option('version-tag', type : 'string',
|
||||
description : 'override the git version string')
|
||||
|
||||
option('mode', type : 'combo', choices : ['developer', 'release'],
|
||||
description : 'enable additional checks suitable for systemd development')
|
||||
description : 'autoenable features suitable for systemd development/release builds')
|
||||
|
||||
option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'],
|
||||
description : '''/bin, /sbin aren't symlinks into /usr''')
|
||||
|
@ -161,3 +161,8 @@
|
||||
_IDN_FEATURE_ " " \
|
||||
_PCRE2_FEATURE_ " " \
|
||||
_CGROUP_HIERARCHY_
|
||||
|
||||
enum {
|
||||
BUILD_MODE_DEVELOPER,
|
||||
BUILD_MODE_RELEASE,
|
||||
};
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
#ifdef CAP_LAST_CAP
|
||||
# if CAP_LAST_CAP > SYSTEMD_CAP_LAST_CAP
|
||||
# if DEVELOPER_MODE && defined(TEST_CAPABILITY_C)
|
||||
# if BUILD_MODE == BUILD_MODE_DEVELOPER && defined(TEST_CAPABILITY_C)
|
||||
# warning "The capability list here is outdated"
|
||||
# endif
|
||||
# else
|
||||
|
@ -33,6 +33,12 @@ static inline bool streq_ptr(const char *a, const char *b) {
|
||||
return strcmp_ptr(a, b) == 0;
|
||||
}
|
||||
|
||||
static inline char* strstr_ptr(const char *haystack, const char *needle) {
|
||||
if (!haystack || !needle)
|
||||
return NULL;
|
||||
return strstr(haystack, needle);
|
||||
}
|
||||
|
||||
static inline const char* strempty(const char *s) {
|
||||
return s ?: "";
|
||||
}
|
||||
|
@ -87,7 +87,7 @@ struct ExecStatus {
|
||||
dual_timestamp exit_timestamp;
|
||||
pid_t pid;
|
||||
int code; /* as in siginfo_t::si_code */
|
||||
int status; /* as in sigingo_t::si_status */
|
||||
int status; /* as in siginfo_t::si_status */
|
||||
};
|
||||
|
||||
/* Stores information about commands we execute. Covers both configuration settings as well as runtime data. */
|
||||
|
@ -301,3 +301,43 @@ int enter_cgroup_subroot(char **ret_cgroup) {
|
||||
int enter_cgroup_root(char **ret_cgroup) {
|
||||
return enter_cgroup(ret_cgroup, false);
|
||||
}
|
||||
|
||||
const char *ci_environment(void) {
|
||||
/* We return a string because we might want to provide multiple bits of information later on: not
|
||||
* just the general CI environment type, but also whether we're sanitizing or not, etc. The caller is
|
||||
* expected to use strstr on the returned value. */
|
||||
static const char *ans = POINTER_MAX;
|
||||
const char *p;
|
||||
int r;
|
||||
|
||||
if (ans != POINTER_MAX)
|
||||
return ans;
|
||||
|
||||
/* We allow specifying the environment with $CITYPE. Nobody uses this so far, but we are ready. */
|
||||
p = getenv("CITYPE");
|
||||
if (!isempty(p))
|
||||
return (ans = p);
|
||||
|
||||
if (getenv_bool("TRAVIS") > 0)
|
||||
return (ans = "travis");
|
||||
if (getenv_bool("SEMAPHORE") > 0)
|
||||
return (ans = "semaphore");
|
||||
if (getenv_bool("GITHUB_ACTIONS") > 0)
|
||||
return (ans = "github-actions");
|
||||
if (getenv("AUTOPKGTEST_ARTIFACTS") || getenv("AUTOPKGTEST_TMP"))
|
||||
return (ans = "autopkgtest");
|
||||
|
||||
FOREACH_STRING(p, "CI", "CONTINOUS_INTEGRATION") {
|
||||
/* Those vars are booleans according to Semaphore and Travis docs:
|
||||
* https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
|
||||
* https://docs.semaphoreci.com/ci-cd-environment/environment-variables/#ci
|
||||
*/
|
||||
r = getenv_bool(p);
|
||||
if (r > 0)
|
||||
return (ans = "unknown"); /* Some other unknown thing */
|
||||
if (r == 0)
|
||||
return (ans = NULL);
|
||||
}
|
||||
|
||||
return (ans = NULL);
|
||||
}
|
||||
|
@ -40,3 +40,6 @@ bool can_memlock(void);
|
||||
} else { \
|
||||
printf("systemd not booted skipping '%s'\n", #x); \
|
||||
}
|
||||
|
||||
/* Provide a convenient way to check if we're running in CI. */
|
||||
const char *ci_environment(void);
|
||||
|
@ -36,11 +36,6 @@ static int cld_dumped_to_killed(int code) {
|
||||
return code == CLD_DUMPED ? CLD_KILLED : code;
|
||||
}
|
||||
|
||||
_unused_ static bool is_run_on_travis_ci(void) {
|
||||
/* https://docs.travis-ci.com/user/environment-variables#default-environment-variables */
|
||||
return streq_ptr(getenv("TRAVIS"), "true");
|
||||
}
|
||||
|
||||
static void wait_for_service_finish(Manager *m, Unit *unit) {
|
||||
Service *service = NULL;
|
||||
usec_t ts;
|
||||
@ -897,7 +892,7 @@ int main(int argc, char *argv[]) {
|
||||
test_setup_logging(LOG_DEBUG);
|
||||
|
||||
#if HAS_FEATURE_ADDRESS_SANITIZER
|
||||
if (is_run_on_travis_ci()) {
|
||||
if (strstr_ptr(ci_environment(), "travis")) {
|
||||
log_notice("Running on TravisCI under ASan, skipping, see https://github.com/systemd/systemd/issues/10696");
|
||||
return EXIT_TEST_SKIP;
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
@ -78,32 +77,52 @@ static Service *service_for_path(Manager *m, Path *path, const char *service_nam
|
||||
return SERVICE(service_unit);
|
||||
}
|
||||
|
||||
static void check_states(Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) {
|
||||
static int _check_states(unsigned line,
|
||||
Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) {
|
||||
assert_se(m);
|
||||
assert_se(service);
|
||||
|
||||
usec_t end = now(CLOCK_MONOTONIC) + 30 * USEC_PER_SEC;
|
||||
|
||||
while (path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS ||
|
||||
path->state != path_state || service->state != service_state) {
|
||||
while (path->state != path_state || service->state != service_state ||
|
||||
path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS) {
|
||||
|
||||
assert_se(sd_event_run(m->event, 100 * USEC_PER_MSEC) >= 0);
|
||||
|
||||
printf("%s: state = %s; result = %s \n",
|
||||
UNIT(path)->id,
|
||||
path_state_to_string(path->state),
|
||||
path_result_to_string(path->result));
|
||||
printf("%s: state = %s; result = %s \n",
|
||||
UNIT(service)->id,
|
||||
service_state_to_string(service->state),
|
||||
service_result_to_string(service->result));
|
||||
usec_t n = now(CLOCK_MONOTONIC);
|
||||
log_info("line %u: %s: state = %s; result = %s (left: %" PRIi64 ")",
|
||||
line,
|
||||
UNIT(path)->id,
|
||||
path_state_to_string(path->state),
|
||||
path_result_to_string(path->result),
|
||||
end - n);
|
||||
log_info("line %u: %s: state = %s; result = %s",
|
||||
line,
|
||||
UNIT(service)->id,
|
||||
service_state_to_string(service->state),
|
||||
service_result_to_string(service->result));
|
||||
|
||||
if (now(CLOCK_MONOTONIC) >= end) {
|
||||
if (service->state == SERVICE_FAILED &&
|
||||
service->main_exec_status.status == EXIT_CGROUP &&
|
||||
!ci_environment())
|
||||
/* On a general purpose system we may fail to start the service for reasons which are
|
||||
* not under our control: permission limits, resource exhaustion, etc. Let's skip the
|
||||
* test in those cases. On developer machines we require proper setup. */
|
||||
return log_notice_errno(SYNTHETIC_ERRNO(ECANCELED),
|
||||
"Failed to start service %s, aborting test: %s/%s",
|
||||
UNIT(service)->id,
|
||||
service_state_to_string(service->state),
|
||||
service_result_to_string(service->result));
|
||||
|
||||
if (n >= end) {
|
||||
log_error("Test timeout when testing %s", UNIT(path)->id);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#define check_states(...) _check_states(__LINE__, __VA_ARGS__)
|
||||
|
||||
static void test_path_exists(Manager *m) {
|
||||
const char *test_path = "/tmp/test-path_exists";
|
||||
@ -119,18 +138,22 @@ static void test_path_exists(Manager *m) {
|
||||
service = service_for_path(m, path, NULL);
|
||||
|
||||
assert_se(unit_start(unit) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(touch(test_path) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
/* Service restarts if file still exists */
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(unit_stop(unit) >= 0);
|
||||
}
|
||||
@ -149,18 +172,22 @@ static void test_path_existsglob(Manager *m) {
|
||||
service = service_for_path(m, path, NULL);
|
||||
|
||||
assert_se(unit_start(unit) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(touch(test_path) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
/* Service restarts if file still exists */
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(unit_stop(unit) >= 0);
|
||||
}
|
||||
@ -180,23 +207,28 @@ static void test_path_changed(Manager *m) {
|
||||
service = service_for_path(m, path, NULL);
|
||||
|
||||
assert_se(unit_start(unit) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(touch(test_path) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
/* Service does not restart if file still exists */
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
f = fopen(test_path, "w");
|
||||
assert_se(f);
|
||||
fclose(f);
|
||||
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
(void) rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL);
|
||||
assert_se(unit_stop(unit) >= 0);
|
||||
@ -217,23 +249,28 @@ static void test_path_modified(Manager *m) {
|
||||
service = service_for_path(m, path, NULL);
|
||||
|
||||
assert_se(unit_start(unit) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(touch(test_path) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
/* Service does not restart if file still exists */
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
f = fopen(test_path, "w");
|
||||
assert_se(f);
|
||||
fputs("test", f);
|
||||
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
(void) rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL);
|
||||
assert_se(unit_stop(unit) >= 0);
|
||||
@ -253,14 +290,17 @@ static void test_path_unit(Manager *m) {
|
||||
service = service_for_path(m, path, "path-mycustomunit.service");
|
||||
|
||||
assert_se(unit_start(unit) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(touch(test_path) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(unit_stop(unit) >= 0);
|
||||
}
|
||||
@ -281,22 +321,26 @@ static void test_path_directorynotempty(Manager *m) {
|
||||
assert_se(access(test_path, F_OK) < 0);
|
||||
|
||||
assert_se(unit_start(unit) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
/* MakeDirectory default to no */
|
||||
assert_se(access(test_path, F_OK) < 0);
|
||||
|
||||
assert_se(mkdir_p(test_path, 0755) >= 0);
|
||||
assert_se(touch(strjoina(test_path, "test_file")) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
/* Service restarts if directory is still not empty */
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);
|
||||
if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)
|
||||
return;
|
||||
|
||||
assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
|
||||
assert_se(unit_stop(UNIT(service)) >= 0);
|
||||
check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);
|
||||
if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)
|
||||
return;
|
||||
|
||||
assert_se(unit_stop(unit) >= 0);
|
||||
}
|
||||
|
@ -604,7 +604,7 @@ int xdg_autostart_service_generate_unit(
|
||||
|
||||
fprintf(f,
|
||||
"\n[Service]\n"
|
||||
"Type=simple\n"
|
||||
"Type=exec\n"
|
||||
"ExecStart=:%s\n"
|
||||
"Restart=no\n"
|
||||
"TimeoutSec=5s\n"
|
||||
|
@ -2,6 +2,6 @@
|
||||
Description=Service Test for Path units
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/true
|
||||
Type=simple
|
||||
ExecStart=sleep infinity
|
||||
Type=exec
|
||||
RemainAfterExit=true
|
||||
|
@ -2,6 +2,6 @@
|
||||
Description=Service Test for Path units
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/true
|
||||
Type=simple
|
||||
ExecStart=sleep infinity
|
||||
Type=exec
|
||||
RemainAfterExit=true
|
||||
|
@ -2,6 +2,6 @@
|
||||
Description=Service Test for Path units
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/true
|
||||
Type=simple
|
||||
ExecStart=sleep infinity
|
||||
Type=exec
|
||||
RemainAfterExit=true
|
||||
|
@ -2,6 +2,6 @@
|
||||
Description=Service Test for Path units
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/true
|
||||
Type=simple
|
||||
ExecStart=sleep infinity
|
||||
Type=exec
|
||||
RemainAfterExit=true
|
||||
|
@ -2,6 +2,6 @@
|
||||
Description=Service Test for Path units
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/true
|
||||
Type=simple
|
||||
ExecStart=sleep infinity
|
||||
Type=exec
|
||||
RemainAfterExit=true
|
||||
|
@ -2,6 +2,6 @@
|
||||
Description=Service Test for Path units
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/true
|
||||
Type=simple
|
||||
ExecStart=sleep infinity
|
||||
Type=exec
|
||||
RemainAfterExit=true
|
||||
|
@ -2,6 +2,6 @@
|
||||
Description=Service Test Path Unit
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/true
|
||||
Type=simple
|
||||
ExecStart=sleep infinity
|
||||
Type=exec
|
||||
RemainAfterExit=true
|
||||
|
@ -1,6 +0,0 @@
|
||||
[Unit]
|
||||
Description=Service Test for Path units
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/true
|
||||
Type=oneshot
|
@ -2,5 +2,5 @@
|
||||
Description=ForeverPrintHola service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
Type=exec
|
||||
ExecStart=sh -x -c 'while :; do printf "Hola\n" || touch /i-lose-my-logs; sleep 1; done'
|
||||
|
@ -4,6 +4,6 @@ StartLimitIntervalSec=1m
|
||||
StartLimitBurst=3
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
Type=exec
|
||||
ExecStart=false
|
||||
Restart=always
|
||||
|
@ -13,7 +13,7 @@ StopWhenUnneeded=yes
|
||||
|
||||
[Service]
|
||||
ExecStartPre=rm -f /failed /testok
|
||||
Type=simple
|
||||
Type=exec
|
||||
TimeoutStartSec=infinity
|
||||
ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh
|
||||
ExecStart=true
|
||||
|
Loading…
Reference in New Issue
Block a user