]> git.cworth.org Git - lmno-server/commitdiff
Add a new empathy_player_deactivate function
authorCarl Worth <cworth@cworth.org>
Sat, 27 Jun 2020 15:18:26 +0000 (08:18 -0700)
committerCarl Worth <cworth@cworth.org>
Sat, 27 Jun 2020 15:18:26 +0000 (08:18 -0700)
To pair with empathy_player_activate and abstract away the goofiness
of pkill and the player_pid=${player}_pid; ${!player_pid} magic.

test

diff --git a/test b/test
index 1a91c0e6eaf77c1216826ca01048d91b8eedbbcb..4594e2ee292363d2f42db9bb1ae463c590583ce8 100755 (executable)
--- a/test
+++ b/test
@@ -469,6 +469,14 @@ empathy_player_activate()
     eval ${player_pid}=$!
 }
 
+# Usage: empathy_player_deactivate <player_name>
+empathy_player_deactivate()
+{
+    player="$1"
+    player_pid=${player}_pid
+    pkill -P ${!player_pid}
+}
+
 # Pulls a single named event out of the empathy event stream
 #
 # Usage: empathy_get_event <player_name> <event_name>
@@ -854,11 +862,11 @@ result=$(echo $(empathy_scores_names_numbers alice))
 test "$result" = '"alice" 2 "bob" 2 "charlie" 0 "dale" 0 "eric" 0 "fred" 0'
 TEST_END
 
-pkill -P $alice_pid
-pkill -P $bob_pid
-pkill -P $charlie_pid
-pkill -P $dale_pid
-pkill -P $eric_pid
-pkill -P $fred_pid
+empathy_player_deactivate alice
+empathy_player_deactivate bob
+empathy_player_deactivate charlie
+empathy_player_deactivate dale
+empathy_player_deactivate eric
+empathy_player_deactivate fred
 
 TEST_REPORT