From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 2/8] tests: Rename 'dmd_pid' to 'shepherd_pid'.
Date: Mon, 25 Jan 2016 13:50:15 +0300 [thread overview]
Message-ID: <1453719021-13836-3-git-send-email-alezost@gmail.com> (raw)
In-Reply-To: <1453719021-13836-1-git-send-email-alezost@gmail.com>
* tests/basic.sh: Rename 'dmd_pid' to 'shepherd_pid'.
* tests/misbehaved-client.sh: Likewise.
* tests/no-home.sh: Likewise.
* tests/respawn.sh: Likewise.
* tests/status-sexp.sh: Likewise.
---
tests/basic.sh | 10 +++++-----
tests/misbehaved-client.sh | 2 +-
tests/no-home.sh | 4 ++--
tests/respawn.sh | 4 ++--
tests/status-sexp.sh | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/tests/basic.sh b/tests/basic.sh
index a20e9dc..e2142c8 100644
--- a/tests/basic.sh
+++ b/tests/basic.sh
@@ -63,9 +63,9 @@ shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
# Wait till it's ready.
while ! test -f "$pid" ; do sleep 0.3 ; done
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
-kill -0 $dmd_pid
+kill -0 $shepherd_pid
test -S "$socket"
pristine_status=`$herd status root` # Prep for 'reload' test.
echo $pristine_status | grep -E '(Start.*root|Stop.*test)'
@@ -126,7 +126,7 @@ $herd status | grep "Stopped: ()"
$herd status | grep "Started: (root)"
$herd stop root
-! kill -0 $dmd_pid
+! kill -0 $shepherd_pid
test -f "$log"
@@ -152,9 +152,9 @@ $herd status test | grep started
$herd stop test
! test -f "$stamp"
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
$herd stop root
-! kill -0 $dmd_pid
+! kill -0 $shepherd_pid
rm -rf $confdir
diff --git a/tests/misbehaved-client.sh b/tests/misbehaved-client.sh
index fad5f4d..edacc45 100644
--- a/tests/misbehaved-client.sh
+++ b/tests/misbehaved-client.sh
@@ -35,7 +35,7 @@ shepherd -I -s "$socket" -c /dev/null -l "$log" --pid="$pid" &
# Wait till it's ready.
while ! test -f "$pid" ; do sleep 0.3 ; done
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
"$GUILE" -c "
(use-modules (shepherd comm))
diff --git a/tests/no-home.sh b/tests/no-home.sh
index 5af51e6..32fa842 100644
--- a/tests/no-home.sh
+++ b/tests/no-home.sh
@@ -37,10 +37,10 @@ trap "rm -f $socket;
# Make sure 'dmd' starts even though $HOME is not writable.
shepherd -I -s "$socket" -c /dev/null -l /dev/null --pid="$pid" &
-dmd_pid="$!"
+shepherd_pid="$!"
# Wait until it's ready, or until it terminates.
-while ! test -f "$pid" ; do kill -0 "$dmd_pid" ; sleep 0.3 ; done
+while ! test -f "$pid" ; do kill -0 "$shepherd_pid" ; sleep 0.3 ; done
kill -0 `cat "$pid"`
$herd status root
diff --git a/tests/respawn.sh b/tests/respawn.sh
index 32d18db..ebc298d 100644
--- a/tests/respawn.sh
+++ b/tests/respawn.sh
@@ -90,9 +90,9 @@ shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
# Wait till it's ready.
wait_for_file "$pid"
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
-kill -0 $dmd_pid
+kill -0 $shepherd_pid
test -S "$socket"
$herd status
$herd status test1 | grep started
diff --git a/tests/status-sexp.sh b/tests/status-sexp.sh
index 3452a15..0f1417c 100644
--- a/tests/status-sexp.sh
+++ b/tests/status-sexp.sh
@@ -54,9 +54,9 @@ shepherd -I -s "$socket" -c "$conf" -l "$log" --pid="$pid" &
# Wait till it's ready.
while ! test -f "$pid" ; do sleep 0.3 ; done
-dmd_pid="`cat $pid`"
+shepherd_pid="`cat $pid`"
-kill -0 $dmd_pid
+kill -0 $shepherd_pid
test -S "$socket"
# Code to fetch service status info.
@@ -123,6 +123,6 @@ $herd unload root all
(error #f) (messages ()))))"
$herd stop root
-! kill -0 $dmd_pid
+! kill -0 $shepherd_pid
test -f "$log"
--
2.6.3
next prev parent reply other threads:[~2016-01-25 10:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 10:50 [SHEPHERD] [PATCH 0/8]: More dmd -> shepherd patches Alex Kost
2016-01-25 10:50 ` [PATCH 1/8] tests: misbehaved-client: Rename 'dmd' to 'root' Alex Kost
2016-01-25 15:07 ` Ludovic Courtès
2016-01-25 10:50 ` Alex Kost [this message]
2016-01-25 15:07 ` [PATCH 2/8] tests: Rename 'dmd_pid' to 'shepherd_pid' Ludovic Courtès
2016-01-25 10:50 ` [PATCH 3/8] ChangeLog: Rename git repository Alex Kost
2016-01-25 15:07 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 4/8] support: Rename 'make-dmd-user-module' to 'make-user-module' Alex Kost
2016-01-25 15:08 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 5/8] Rename default system configuration file Alex Kost
2016-01-25 15:08 ` Ludovic Courtès
2016-01-25 10:50 ` [PATCH 6/8] support: Rename state file Alex Kost
2016-01-25 15:11 ` Ludovic Courtès
2016-01-25 19:26 ` Efraim Flashner
2016-01-25 19:36 ` Efraim Flashner
2016-01-25 10:50 ` [PATCH 7/8] utils: Rename 'dmd-gettext.scm' to 'shepherd-gettext.scm' Alex Kost
2016-01-25 15:12 ` Ludovic Courtès
2016-01-25 15:59 ` Alex Kost
2016-01-25 21:51 ` Ludovic Courtès
2016-01-26 9:42 ` Alex Kost
2016-01-25 10:50 ` [PATCH 8/8] Replace "dmd" with "shepherd" in comments and strings Alex Kost
2016-01-25 15:13 ` Ludovic Courtès
2016-01-25 16:14 ` Alex Kost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453719021-13836-3-git-send-email-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).