Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/tests_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def run_and_get_output(config, detach=False, preserve_fds=None, pid_file=None,
keep=False,
command='run', env=None, use_popen=False, hide_stderr=False, cgroup_manager='cgroupfs',
all_dev_null=False, stdin_dev_null=False, id_container=None, relative_config_path="config.json",
chown_rootfs_to=None, callback_prepare_rootfs=None, debug_on_error=None):
chown_rootfs_to=None, callback_prepare_rootfs=None, debug=False):

# Some tests require that the container user, which might not be the
# same user as the person running the tests, is able to resolve the full path
Expand Down Expand Up @@ -285,9 +285,10 @@ def run_and_get_output(config, detach=False, preserve_fds=None, pid_file=None,
preserve_fds_arg = ['--preserve-fds', str(preserve_fds)] if preserve_fds else []
pid_file_arg = ['--pid-file', pid_file] if pid_file else []
relative_config_path = ['--config', relative_config_path] if relative_config_path else []
debug_arg = ['--debug'] if debug else []

root = get_tests_root_status()
args = [crun, "--cgroup-manager", cgroup_manager, "--root", root, command] + relative_config_path + preserve_fds_arg + detach_arg + keep_arg + pid_file_arg + [id_container]
args = [crun] + debug_arg + ["--cgroup-manager", cgroup_manager, "--root", root, command] + relative_config_path + preserve_fds_arg + detach_arg + keep_arg + pid_file_arg + [id_container]

stderr = subprocess.STDOUT
if hide_stderr:
Expand Down