From 41680ff663f2cb56e01a41bd157680928b185db6 Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrewb@zip.com.au>
Date: Mon, 27 Aug 2012 17:07:44 +0930
Subject: [PATCH] Move functions from testdefs.sh to testdefs_rhizome.sh

... where they should have been in the first place.

Also, clean up the RHIZOME HTTP SERVER START log message.

Issue #9.
---
 rhizome_http.c      |  2 +-
 testdefs.sh         | 17 -----------------
 testdefs_rhizome.sh | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/rhizome_http.c b/rhizome_http.c
index fcca6a2d..4537611e 100644
--- a/rhizome_http.c
+++ b/rhizome_http.c
@@ -199,7 +199,7 @@ error:
   return WHY("Failed to start rhizome HTTP server");
 
 success:
-  INFOF("RHIZOME HTTP SERVER, START port=%d, fd=%d", port, rhizome_server_socket);
+  INFOF("RHIZOME HTTP SERVER, START port=%d fd=%d", port, rhizome_server_socket);
   rhizome_http_server_port = port;
   /* Add Rhizome HTTPd server to list of file descriptors to watch */
   server_alarm.function = rhizome_server_poll;
diff --git a/testdefs.sh b/testdefs.sh
index 05865590..ad55ea3d 100644
--- a/testdefs.sh
+++ b/testdefs.sh
@@ -509,20 +509,3 @@ instances_see_each_other() {
    done
    return 0
 }
-
-rhizome_http_server_started() {
-   local logvar=LOG${1#+}
-   grep 'RHIZOME HTTP SERVER,.*START.*port=[0-9]' "${!logvar}"
-}
-
-get_rhizome_server_port() {
-   local _var="$1"
-   local _logvar=LOG${2#+}
-   local _port=$(sed -n -e '/.*RHIZOME HTTP SERVER.*START/{s/.*port=\([0-9]\{1,\}\).*/\1/p;q}' "${!_logvar}")
-   assert --message="instance $2 Rhizome HTTP server port number is known" [ -n "$_port" ]
-   if [ -n "$_var" ]; then
-      eval "$_var=\$_port"
-      tfw_log "$_var=$_port"
-   fi
-   return 0
-}
diff --git a/testdefs_rhizome.sh b/testdefs_rhizome.sh
index a8b36fc0..603ec918 100644
--- a/testdefs_rhizome.sh
+++ b/testdefs_rhizome.sh
@@ -257,3 +257,20 @@ compute_filehash() {
    [ "${#_hash}" -eq 128 ] || error "file hash incorrect length: $_hash"
    [ -n "$_var" ] && eval $_var="$_hash"
 }
+
+rhizome_http_server_started() {
+   local logvar=LOG${1#+}
+   grep 'RHIZOME HTTP SERVER,.*START.*port=[0-9]' "${!logvar}"
+}
+
+get_rhizome_server_port() {
+   local _var="$1"
+   local _logvar=LOG${2#+}
+   local _port=$(sed -n -e '/.*RHIZOME HTTP SERVER.*START/{s/.*port=\([0-9]\{1,\}\).*/\1/p;q}' "${!_logvar}")
+   assert --message="instance $2 Rhizome HTTP server port number is known" [ -n "$_port" ]
+   if [ -n "$_var" ]; then
+      eval "$_var=\$_port"
+      tfw_log "$_var=$_port"
+   fi
+   return 0
+}