From 903e7c37caaaedf8ab0b6c664f4946cce369c0f0 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 18 May 2015 00:58:24 -0400 Subject: Use "new" --job-mode= option in more places --irreversible/--ignore-dependencies/--fail are deprececated since 4dc5b821ae737914499119e29811fc3346e3d97c. Also add shell completions for --jobs-mode. --- test/TEST-03-JOBS/test-jobs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/TEST-03-JOBS/test-jobs.sh') diff --git a/test/TEST-03-JOBS/test-jobs.sh b/test/TEST-03-JOBS/test-jobs.sh index 28368b70e4..6f32c240cd 100755 --- a/test/TEST-03-JOBS/test-jobs.sh +++ b/test/TEST-03-JOBS/test-jobs.sh @@ -1,6 +1,6 @@ #!/bin/bash -x -# Test merging of a --ignore-dependencies job into a previously +# Test merging of a --job-mode=ignore-dependencies job into a previously # installed job. systemctl start --no-block hello-after-sleep.target @@ -11,7 +11,7 @@ grep 'hello\.service.*waiting' /root/list-jobs.txt || exit 1 # This is supposed to finish quickly, not wait for sleep to finish. START_SEC=$(date -u '+%s') -systemctl start --ignore-dependencies hello +systemctl start --job-mode=ignore-dependencies hello END_SEC=$(date -u '+%s') ELAPSED=$(($END_SEC-$START_SEC)) @@ -27,7 +27,7 @@ systemctl stop sleep.service hello-after-sleep.target || exit 1 systemctl start --no-block hello-after-sleep.target || exit 1 # hello.service should still be waiting, so these try-restarts will collapse # into NOPs. -systemctl try-restart --fail hello.service || exit 1 +systemctl try-restart --job-mode=fail hello.service || exit 1 systemctl try-restart hello.service || exit 1 systemctl stop hello.service sleep.service hello-after-sleep.target || exit 1 @@ -39,7 +39,7 @@ systemctl start unstoppable.service || exit 1 # This is expected to fail with 'job cancelled' systemctl stop unstoppable.service && exit 1 # But this should succeed -systemctl stop --irreversible unstoppable.service || exit 1 +systemctl stop --job-mode=replace-irreversibly unstoppable.service || exit 1 # We're going to shutdown soon. Let's see if it succeeds when # there's an active service that tries to be unstoppable. -- cgit v1.2.3-54-g00ecf