diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2012-10-17 10:55:23 +0200 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2012-10-17 10:55:23 +0200 |
commit | c5401a6d595a595ee16ee6aede55fb016b9cfdfd (patch) | |
tree | 93d9bb33837bc1cea44ba4ca3c8ce9f8882ab523 /test | |
parent | a3ce3f7eabbb746aa9ced430bcd55391742c738b (diff) | |
download | app.sh-c5401a6d595a595ee16ee6aede55fb016b9cfdfd.tar.gz app.sh-c5401a6d595a595ee16ee6aede55fb016b9cfdfd.tar.bz2 app.sh-c5401a6d595a595ee16ee6aede55fb016b9cfdfd.tar.xz app.sh-c5401a6d595a595ee16ee6aede55fb016b9cfdfd.zip |
o Proper implementation of start, stop and status.
Diffstat (limited to 'test')
-rw-r--r-- | test/data/app-a/root/bin/app-a | 4 | ||||
-rwxr-xr-x | test/it-install-remove.bats | 24 | ||||
-rw-r--r-- | test/utils.bash | 28 |
3 files changed, 47 insertions, 9 deletions
diff --git a/test/data/app-a/root/bin/app-a b/test/data/app-a/root/bin/app-a index 7d251a0..1386f31 100644 --- a/test/data/app-a/root/bin/app-a +++ b/test/data/app-a/root/bin/app-a @@ -2,8 +2,12 @@ me=`basename $0` +echo "Starting" >> $me.log + for i in {1..10} do echo "#$i: `date`" >> $me.log sleep 1 done + +echo "Exiting" >> $me.log diff --git a/test/it-install-remove.bats b/test/it-install-remove.bats index 98a79c9..3358118 100755 --- a/test/it-install-remove.bats +++ b/test/it-install-remove.bats @@ -5,18 +5,28 @@ load utils @test "install remove roundtrip" { mkzip "app-a" - a="-n app-a -i prod" + name="app-a" + instance="prod" + a="-n $name -i $instance" + + describe "Installing $name/$instance" app instance install \ -r file \ -u $BATS_TEST_DIRNAME/data/app-a.zip \ - $a + -n $name -i $instance + +# set -x + can_not_read ".app/var/pid/$name-$instance.pid" - [ ! -r .app/var/pid/$name-$instance.pid ] - app $a operate start; echo_lines - [ -r .app/var/pid/$name-$instance.pid ] + describe "Starting $name/$instance" + app -n $name -i $instance operate start + echo_lines + can_read .app/var/pid/$name-$instance.pid - app $a operate stop; echo_lines - [ ! -r .app/var/pid/$name-$instance.pid ] + describe "Stopping $name/$instance" + app -n $name -i $instance operate stop + echo_lines + can_not_read .app/var/pid/$name-$instance.pid # app instance install \ # -r file \ diff --git a/test/utils.bash b/test/utils.bash index 03871f8..653aae4 100644 --- a/test/utils.bash +++ b/test/utils.bash @@ -30,6 +30,30 @@ mkzip() { } app() { - (set -x - run ./app "$@") + echo ./app $@ + run ./app $@ +} + +describe() { + echo "# " $@ >&3 +} + +can_read() { + if [ -r "$1" ] + then + return 0 + else + echo "Can't read $1" + return 1 + fi +} + +can_not_read() { + if [ ! -r "$1" ] + then + return 0 + else + echo "Can read $1" + return 1 + fi } |