From 4e09889cab720e57f63c3e42bca8ef7102ca38e6 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 17 Mar 2016 18:19:24 +0000
Subject: [PATCH] Make container_pid a common test function

---
 test/090_docker_restart_policy_2_test.sh | 8 ++------
 test/config.sh                           | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/090_docker_restart_policy_2_test.sh b/test/090_docker_restart_policy_2_test.sh
index b8b9a5a7..dba02595 100755
--- a/test/090_docker_restart_policy_2_test.sh
+++ b/test/090_docker_restart_policy_2_test.sh
@@ -4,17 +4,13 @@
 
 start_suite "Test docker restart policy"
 
-pidof() {
-    docker_on $1 inspect -f '{{.State.Pid}}' $2
-}
-
 check_restart() {
-    OLD_PID=$(pidof $1 $2)
+    OLD_PID=$(container_pid $1 $2)
 
     run_on $1 sudo kill $OLD_PID
 
     for i in $(seq 1 30); do
-        NEW_PID=$(pidof $1 $2)
+        NEW_PID=$(container_pid $1 $2)
 
         if [ $NEW_PID != 0 -a $NEW_PID != $OLD_PID ] ; then
             return 0
diff --git a/test/config.sh b/test/config.sh
index 3d23562f..aefdd6b7 100644
--- a/test/config.sh
+++ b/test/config.sh
@@ -183,6 +183,10 @@ container_ip() {
     weave_on $1 ps $2 | grep -o -E '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'
 }
 
+container_pid() {
+    docker_on $1 inspect -f '{{.State.Pid}}' $2
+}
+
 # assert_dns_record <host> <container> <name> [<ip> ...]
 assert_dns_record() {
     local host=$1