From e79c8ff697f46f049e0f669560daccddf46a5ea1 Mon Sep 17 00:00:00 2001 From: Pratima, Madhurranjan, Nilesh Date: Jul 22 2012 12:10:47 +0000 Subject: Merge branch 'master' of https://nazar.karan.org/git/deopsdaysindia --- diff --git a/tests/0_lib/functions.sh b/tests/0_lib/functions.sh index de4093c..8643624 100755 --- a/tests/0_lib/functions.sh +++ b/tests/0_lib/functions.sh @@ -115,6 +115,12 @@ function t_GetArch rpm -q --queryformat '%{arch}\n' centos-release } +function t_Assert +{ + $@ >/dev/null 2>&1 + t_CheckExitStatus $? +} + export -f t_Log export -f t_CheckExitStatus export -f t_InstallPackage @@ -126,3 +132,4 @@ export -f t_GetPkgRel export -f t_DistCheck export -f t_GetPkgVer export -f t_GetArch +export -f t_Assert diff --git a/tests/0_ruby/0-install-ruby.sh b/tests/0_ruby/0-install-ruby.sh deleted file mode 100755 index 42ecd58..0000000 --- a/tests/0_ruby/0-install-ruby.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# Author: White team - -t_Log "Running $0 - attempting to install openssl." -t_InstallPackage ruby -t_InstallPackage ruby-irb - - diff --git a/tests/0_ruby/10-ruby-installed-test.sh b/tests/0_ruby/10-ruby-installed-test.sh deleted file mode 100755 index cf3783e..0000000 --- a/tests/0_ruby/10-ruby-installed-test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Author: Nikhil Lanjewar -# Author: Sahil Muthoo -# Author: Sahil Aggarwal -# Author: Saager Mhatre - -t_Log "Running $0 - Check successful installation of ruby." -ruby -v -t_CheckExitStatus $? - diff --git a/tests/0_ruby/20-ruby-version-test.sh b/tests/0_ruby/20-ruby-version-test.sh deleted file mode 100755 index 94bef97..0000000 --- a/tests/0_ruby/20-ruby-version-test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Author: Nikhil Lanjewar -# Author: Sahil Muthoo -# Author: Sahil Aggarwal -# Author: Saager Mhatre - -t_Log "Running $0 - Check successful installation of ruby." -ruby -v | grep -q '1.8.7' -t_CheckExitStatus $? - diff --git a/tests/0_ruby/30-irb-test.sh b/tests/0_ruby/30-irb-test.sh deleted file mode 100755 index 53e09d8..0000000 --- a/tests/0_ruby/30-irb-test.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Author: Nikhil Lanjewar -# Author: Sahil Muthoo -# Author: Sahil Aggarwal -# Author: Saager Mhatre - -t_Log "Running $0 - Check successful installation of irb." - -irb -v | grep '0.9.5' - -t_CheckExitStatus $? - diff --git a/tests/p_0-file/00_file_package.sh b/tests/p_0-file/00_file_package.sh index fecdcb0..402649c 100755 --- a/tests/p_0-file/00_file_package.sh +++ b/tests/p_0-file/00_file_package.sh @@ -2,6 +2,4 @@ t_Log "Running $0 - checking if file package is installed" -rpm -q file > /dev/null 2>&1 - -t_CheckExitStatus $? +t_Assert "rpm -q file" diff --git a/tests/p_0-ruby/0-install-ruby.sh b/tests/p_0-ruby/0-install-ruby.sh new file mode 100755 index 0000000..14d98b9 --- /dev/null +++ b/tests/p_0-ruby/0-install-ruby.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Author: Nikhil Lanjewar +# Author: Sahil Muthoo +# Author: Sahil Aggarwal +# Author: Saager Mhatre + +t_Log "Running $0 - attempting to install ruby, ruby-irb, ruby-ri and ruby-rdoc4" +t_InstallPackage ruby +t_InstallPackage ruby-irb +t_InstallPackage ruby-ri +t_InstallPackage ruby-rdoc + diff --git a/tests/p_0-ruby/10-ruby-installed-test.sh b/tests/p_0-ruby/10-ruby-installed-test.sh new file mode 100755 index 0000000..cf3783e --- /dev/null +++ b/tests/p_0-ruby/10-ruby-installed-test.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# Author: Nikhil Lanjewar +# Author: Sahil Muthoo +# Author: Sahil Aggarwal +# Author: Saager Mhatre + +t_Log "Running $0 - Check successful installation of ruby." +ruby -v +t_CheckExitStatus $? + diff --git a/tests/p_0-ruby/20-ruby-version-test.sh b/tests/p_0-ruby/20-ruby-version-test.sh new file mode 100755 index 0000000..94bef97 --- /dev/null +++ b/tests/p_0-ruby/20-ruby-version-test.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# Author: Nikhil Lanjewar +# Author: Sahil Muthoo +# Author: Sahil Aggarwal +# Author: Saager Mhatre + +t_Log "Running $0 - Check successful installation of ruby." +ruby -v | grep -q '1.8.7' +t_CheckExitStatus $? + diff --git a/tests/p_0-ruby/30-irb-test.sh b/tests/p_0-ruby/30-irb-test.sh new file mode 100755 index 0000000..53e09d8 --- /dev/null +++ b/tests/p_0-ruby/30-irb-test.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Author: Nikhil Lanjewar +# Author: Sahil Muthoo +# Author: Sahil Aggarwal +# Author: Saager Mhatre + +t_Log "Running $0 - Check successful installation of irb." + +irb -v | grep '0.9.5' + +t_CheckExitStatus $? + diff --git a/tests/p_0-ruby/40-ri-test.sh b/tests/p_0-ruby/40-ri-test.sh new file mode 100755 index 0000000..1a5d230 --- /dev/null +++ b/tests/p_0-ruby/40-ri-test.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Author: Nikhil Lanjewar +# Author: Sahil Muthoo +# Author: Sahil Aggarwal +# Author: Saager Mhatre + +t_Log "Running $0 - Check successful installation of ruby ri." + +ri -v | grep 'v1.0.1' + +t_CheckExitStatus $? + diff --git a/tests/p_0-ruby/50-rdoc-test.sh b/tests/p_0-ruby/50-rdoc-test.sh new file mode 100755 index 0000000..9d351dd --- /dev/null +++ b/tests/p_0-ruby/50-rdoc-test.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Author: Nikhil Lanjewar +# Author: Sahil Muthoo +# Author: Sahil Aggarwal +# Author: Saager Mhatre + +t_Log "Running $0 - Check successful installation of ruby rdoc." + +rdoc -v | grep 'V1.0.1' + +t_CheckExitStatus $? +