Clean up test scripts with common include

rundeck · Feb 15, 2011 · ee695b7 · ee695b7
1 parent 6db0b4f
commit ee695b7
Show file tree

Hide file tree

Showing 31 changed files with 125 additions and 682 deletions.
diff --git a/test/api/include.sh b/test/api/include.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# common header for test scripts
+
+DIR=$(cd `dirname $0` && pwd)
+
+errorMsg() {
+   echo "$*" 1>&2
+}
+assert(){
+    # assert expected, actual
+    if [ "$1" != "$2" ] ; then
+        errorMsg "FAIL: Expected value \"$1\" but saw: \"$2\" ${3}"
+        exit 2
+    fi
+}
+
+# modify to point to xmlstarlet
+XMLSTARLET=xml
+
+# xmlstarlet select xpath
+# usage: xmlsel XPATH file
+xmlsel(){
+    $XMLSTARLET sel -T -t -v "$1" $2
+}
+
+VERSHEADER="X-RUNDECK-API-VERSION: 1.2"
+
+# curl opts to use a cookie jar, and follow redirects, showing only errors
+CURLOPTS="-s -S -L -c $DIR/cookies -b $DIR/cookies"
+CURL="curl $CURLOPTS"
+
+# accept url argument on commandline, if '-' use default
+RDURL="$1"
+if [ "-" == "$1" ] ; then
+    RDURL='http://localhost:4440'
+fi
+shift
+
+APIURL="${RDURL}/api"
diff --git a/test/api/test-execution-abort.sh b/test/api/test-execution-abort.sh
@@ -2,39 +2,14 @@
 
 #test aborting execution from /api/execution/{id}/abort
 
-errorMsg() {
-   echo "$*" 1>&2
-}
-assert(){
-    # assert expected, actual
-    if [ "$1" != "$2" ] ; then
-        errorMsg "FAIL: Expected value \"$1\" but saw: \"$2\" ${3}"
-        exit 2
-    fi
-}
-
 DIR=$(cd `dirname $0` && pwd)
-
-# accept url argument on commandline, if '-' use default
-url="$1"
-if [ "-" == "$1" ] ; then
-    url='http://localhost:4440'
-fi
-apiurl="${url}/api"
-VERSHEADER="X-RUNDECK-API-VERSION: 1.2"
-
-# curl opts to use a cookie jar, and follow redirects, showing only errors
-CURLOPTS="-s -S -L -c $DIR/cookies -b $DIR/cookies"
-CURL="curl $CURLOPTS"
-
-
-XMLSTARLET=xml
+source $DIR/include.sh
 
 ####
 # Setup: create simple adhoc command execution to provide execution ID.
 ####
 
-runurl="${apiurl}/run/command"
+runurl="${APIURL}/run/command"
 proj="test"
 params="project=${proj}&exec=echo+testing+execution+api%3Bsleep+120"
 
@@ -62,7 +37,7 @@ fi
 ####
 
 # now submit req
-runurl="${apiurl}/execution/${execid}"
+runurl="${APIURL}/execution/${execid}"
 
 echo "TEST: /api/execution/${execid} ..."
 
@@ -90,7 +65,7 @@ echo "OK"
 # test /abort
 ####
 
-runurl="${apiurl}/execution/${execid}/abort"
+runurl="${APIURL}/execution/${execid}/abort"
 
 echo "TEST: /api/execution/${execid}/abort ..."
 

diff --git a/test/api/test-execution.sh b/test/api/test-execution.sh
@@ -2,39 +2,14 @@
 
 #test output from /api/execution/{id}
 
-errorMsg() {
-   echo "$*" 1>&2
-}
-assert(){
-    # assert expected, actual
-    if [ "$1" != "$2" ] ; then
-        errorMsg "FAIL: Expected value \"$1\" but saw: \"$2\" ${3}"
-        exit 2
-    fi
-}
-
 DIR=$(cd `dirname $0` && pwd)
-
-# accept url argument on commandline, if '-' use default
-url="$1"
-if [ "-" == "$1" ] ; then
-    url='http://localhost:4440'
-fi
-apiurl="${url}/api"
-VERSHEADER="X-RUNDECK-API-VERSION: 1.2"
-
-# curl opts to use a cookie jar, and follow redirects, showing only errors
-CURLOPTS="-s -S -L -c $DIR/cookies -b $DIR/cookies"
-CURL="curl $CURLOPTS"
-
-
-XMLSTARLET=xml
+source $DIR/include.sh
 
 ####
 # Setup: create simple adhoc command execution to provide execution ID.
 ####
 
-runurl="${apiurl}/run/command"
+runurl="${APIURL}/run/command"
 proj="test"
 params="project=${proj}&exec=echo+testing+execution+api"
 
@@ -62,7 +37,7 @@ fi
 ####
 
 # now submit req
-runurl="${apiurl}/execution/${execid}"
+runurl="${APIURL}/execution/${execid}"
 
 echo "TEST: /api/execution/${execid} ..."
 

diff --git a/test/api/test-executions-running.sh b/test/api/test-executions-running.sh
@@ -2,29 +2,12 @@
 
 #test output from /api/executions/running
 
-errorMsg() {
-   echo "$*" 1>&2
-}
-
 DIR=$(cd `dirname $0` && pwd)
+source $DIR/include.sh
 
-# accept url argument on commandline, if '-' use default
-url="$1"
-if [ "-" == "$1" ] ; then
-    url='http://localhost:4440'
-fi
-apiurl="${url}/api"
-VERSHEADER="X-RUNDECK-API-VERSION: 1.2"
-
-# curl opts to use a cookie jar, and follow redirects, showing only errors
-CURLOPTS="-s -S -L -c $DIR/cookies -b $DIR/cookies"
-CURL="curl $CURLOPTS"
-
-
-XMLSTARLET=xml
 
 # now submit req
-runurl="${apiurl}/executions/running"
+runurl="${APIURL}/executions/running"
 proj=$2
 if [ "" == "$2" ] ; then
     proj="test"

diff --git a/test/api/test-history.sh b/test/api/test-history.sh
@@ -2,32 +2,13 @@
 
 #Test api: /api/history output
 
-errorMsg() {
-   echo "$*" 1>&2
-}
-
 DIR=$(cd `dirname $0` && pwd)
-
-# accept url argument on commandline, if '-' use default
-url="$1"
-if [ "-" == "$1" ] ; then
-    url='http://localhost:4440'
-fi
-shift
+source $DIR/include.sh
 
 proj="test"
 
-apiurl="${url}/api"
-VERSHEADER="X-RUNDECK-API-VERSION: 1.2"
-
-# curl opts to use a cookie jar, and follow redirects, showing only errors
-CURLOPTS="-s -S -L -c $DIR/cookies -b $DIR/cookies"
-CURL="curl $CURLOPTS"
-
-XMLSTARLET=xml
-
 # now submit req
-runurl="${apiurl}/history"
+runurl="${APIURL}/history"
 
 echo "TEST: output from /api/history should be valid"
 

diff --git a/test/api/test-invalid.sh b/test/api/test-invalid.sh
@@ -2,29 +2,11 @@
 
 #test output from invalid api request path: /api/dnexist
 
-errorMsg() {
-   echo "$*" 1>&2
-}
-
 DIR=$(cd `dirname $0` && pwd)
-
-# accept url argument on commandline, if '-' use default
-url="$1"
-if [ "-" == "$1" ] ; then
-    url='http://localhost:4440/api'
-fi
-apiurl="${url}/api"
-VERSHEADER="X-RUNDECK-API-VERSION: 1.2"
-
-# curl opts to use a cookie jar, and follow redirects, showing only errors
-CURLOPTS="-s -S -L -c $DIR/cookies -b $DIR/cookies"
-CURL="curl $CURLOPTS"
-
-
-XMLSTARLET=xml
+source $DIR/include.sh
 
 # now submit req
-runurl="${apiurl}/dnexist"
+runurl="${APIURL}/dnexist"
 
 echo "TEST: api request to invalid api path"
 

diff --git a/test/api/test-job-delete.sh b/test/api/test-job-delete.sh
@@ -2,27 +2,9 @@
 
 #test DELETE for /api/job/{id}
 
-errorMsg() {
-   echo "$*" 1>&2
-}
 
 DIR=$(cd `dirname $0` && pwd)
-
-# accept url argument on commandline, if '-' use default
-url="$1"
-if [ "-" == "$1" ] ; then
-    url='http://localhost:4440/api'
-fi
-apiurl="${url}/api"
-
-VERSHEADER="X-RUNDECK-API-VERSION: 1.2"
-
-# curl opts to use a cookie jar, and follow redirects, showing only errors
-CURLOPTS="-s -S -L -c $DIR/cookies -b $DIR/cookies"
-CURL="curl $CURLOPTS"
-
-
-XMLSTARLET=xml
+source $DIR/include.sh
 
 ###
 # setup: create a new job and acquire the ID
@@ -66,7 +48,7 @@ cat > $DIR/temp.out <<END
 END
 
 # now submit req
-runurl="${apiurl}/jobs/import"
+runurl="${APIURL}/jobs/import"
 
 params=""
 
@@ -102,7 +84,7 @@ echo "TEST: DELETE job should succeed"
 
 
 # now submit req
-runurl="${apiurl}/job/${jobid}"
+runurl="${APIURL}/job/${jobid}"
 params=""
 
 # get listing
@@ -123,7 +105,7 @@ echo "OK"
 echo "TEST: Get deleted job should fail"
 
 # now submit req
-runurl="${apiurl}/job/${jobid}"
+runurl="${APIURL}/job/${jobid}"
 params=""
 sh $DIR/api-expect-error.sh "${runurl}" "${params}" "Job ID does not exist: ${jobid}" || exit 2
 

diff --git a/test/api/test-job-export-missing.sh b/test/api/test-job-export-missing.sh
@@ -2,27 +2,9 @@
 
 #test output from /api/job/{id} when job ID does not exist
 
-errorMsg() {
-   echo "$*" 1>&2
-}
 
 DIR=$(cd `dirname $0` && pwd)
-
-# accept url argument on commandline, if '-' use default
-url="$1"
-if [ "-" == "$1" ] ; then
-    url='http://localhost:4440/api'
-fi
-apiurl="${url}/api"
-
-VERSHEADER="X-RUNDECK-API-VERSION: 1.2"
-
-# curl opts to use a cookie jar, and follow redirects, showing only errors
-CURLOPTS="-s -S -L -c $DIR/cookies -b $DIR/cookies"
-CURL="curl $CURLOPTS"
-
-
-XMLSTARLET=xml
+source $DIR/include.sh
 
 ###
 # Export an invalid ID
@@ -32,7 +14,7 @@ echo "TEST: export job with wrong ID"
 
 
 # now submit req
-runurl="${apiurl}/job/9000"
+runurl="${APIURL}/job/9000"
 params=""
 
 # expect error message