From 9b13b5f8151f46c9fbbdbe86c1de1bbd1fe0196e Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Nov 10 2012 19:05:36 +0000
Subject: removed some verify-installation tests as followup test do this none the less, tests now use $centos_ver


---

diff --git a/tests/p_ruby/20-ruby-version-test.sh b/tests/p_ruby/20-ruby-version-test.sh
index 0f5c30c..2d26359 100755
--- a/tests/p_ruby/20-ruby-version-test.sh
+++ b/tests/p_ruby/20-ruby-version-test.sh
@@ -6,13 +6,12 @@
 #	  Christoph Galuschka <christoph.galuschka@chello.at>
 
 t_Log "Running $0 - Check version of ruby."
-v=$( ruby -v )
-if (t_GetPkgRel basesystem | grep -q el5)
+if [ $centos_ver = 6 ]
   then
-  ruby -v | grep -q '1.8.5'
+  ruby -v | grep -q '1.8.7'
   ret_val=$?
 else
-  ruby -v | grep -q '1.8.7'
+  ruby -v | grep -q '1.8.5'
   ret_val=$?
 fi
 
diff --git a/tests/p_ruby/30-irb-test.sh b/tests/p_ruby/30-irb-test.sh
deleted file mode 100755
index 53e09d8..0000000
--- a/tests/p_ruby/30-irb-test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Author: Nikhil Lanjewar <nikhil@lanjewar.com>
-# Author: Sahil Muthoo <sahilm@thoughtworks.com>
-# Author: Sahil Aggarwal <sahilagg@gmail.com>
-# Author: Saager Mhatre <saager.mhatre@gmail.com>
-
-t_Log "Running $0 - Check successful installation of irb."
-
-irb -v | grep '0.9.5'
-
-t_CheckExitStatus $?
-
diff --git a/tests/p_ruby/30-irb-version-test.st b/tests/p_ruby/30-irb-version-test.st
index 7b8bde2..12311f4 100755
--- a/tests/p_ruby/30-irb-version-test.st
+++ b/tests/p_ruby/30-irb-version-test.st
@@ -8,7 +8,7 @@
 t_Log "Running $0 - Check version of irb."
 
 #allready prepared just in case versions should change between C5 and C6
-if (t_GetPkgRel basesystem | grep -q el5)
+if [ $centos_ver = 5 ]
   then
   irb -v | grep -q '0.9.5'
   ret_val=$?
diff --git a/tests/p_ruby/40-ri-test.sh b/tests/p_ruby/40-ri-test.sh
deleted file mode 100755
index 1a5d230..0000000
--- a/tests/p_ruby/40-ri-test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Author: Nikhil Lanjewar <nikhil@lanjewar.com>
-# Author: Sahil Muthoo <sahilm@thoughtworks.com>
-# Author: Sahil Aggarwal <sahilagg@gmail.com>
-# Author: Saager Mhatre <saager.mhatre@gmail.com>
-
-t_Log "Running $0 - Check successful installation of ruby ri."
-
-ri -v | grep 'v1.0.1'
-
-t_CheckExitStatus $?
-
diff --git a/tests/p_ruby/40-ri-version-test.sh b/tests/p_ruby/40-ri-version-test.sh
index ff0a1f1..017fb76 100755
--- a/tests/p_ruby/40-ri-version-test.sh
+++ b/tests/p_ruby/40-ri-version-test.sh
@@ -8,7 +8,7 @@
 t_Log "Running $0 - Check version of ruby ri."
 
 #allready prepared just in case versions should change between C5 and C6
-if (t_GetPkgRel basesystem | grep -q el5)
+if [ $centos_ver = 5 ]
   then
   ri -v | grep -q '1.0.1'
   ret_val=$?
diff --git a/tests/p_ruby/50-rdoc-test.sh b/tests/p_ruby/50-rdoc-test.sh
deleted file mode 100755
index 9d351dd..0000000
--- a/tests/p_ruby/50-rdoc-test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Author: Nikhil Lanjewar <nikhil@lanjewar.com>
-# Author: Sahil Muthoo <sahilm@thoughtworks.com>
-# Author: Sahil Aggarwal <sahilagg@gmail.com>
-# Author: Saager Mhatre <saager.mhatre@gmail.com>
-
-t_Log "Running $0 - Check successful installation of ruby rdoc."
-
-rdoc -v | grep 'V1.0.1'
-
-t_CheckExitStatus $?
-
diff --git a/tests/p_ruby/50-rdoc-version-test.sh b/tests/p_ruby/50-rdoc-version-test.sh
index 3bbdbaa..986b4c3 100755
--- a/tests/p_ruby/50-rdoc-version-test.sh
+++ b/tests/p_ruby/50-rdoc-version-test.sh
@@ -8,7 +8,7 @@
 t_Log "Running $0 - Check version of rdoc."
 
 #allready prepared just in case versions should change between C5 and C6
-if (t_GetPkgRel basesystem | grep -q el5)
+if [ $centos_ver = 5 ]
   then
   rdoc -v | grep -q '1.0.1'
   ret_val=$?