From 2d7841fdf589504a0c7b7444294ea7fd300a4496 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmanem@gmail.com>
Date: Nov 21 2011 09:16:37 +0000
Subject: Merge commit 'refs/merge-requests/17' of git://gitorious.org/testautomation/t_functional into merge-requests/17


---

diff --git a/tests/p_freeradius/radiusd_test.sh b/tests/p_freeradius/radiusd_test.sh
index d3be6a3..fd1487b 100755
--- a/tests/p_freeradius/radiusd_test.sh
+++ b/tests/p_freeradius/radiusd_test.sh
@@ -19,33 +19,15 @@ echo '       Service-Type = Framed-User,' >> /etc/raddb/users
 # Restart Service
 service radiusd restart
 
-#Run test, treat C6 and C5 differently
+#Run test
 
-if (t_GetPkgRel basesystem | grep -q el6)
-  then
-  t_Log "Running C6-Test"
-  WORKING=$(radtest -d /etc/raddb -x steve centos 127.0.0.1:1812 1 testing123 |grep -c 'Access-Accept')
-  if [ $WORKING == 1 ]; then ret_val=0 ; fi
-else
-  t_Log "Running C5-Test"
-  WORKING=$(radtest steve centos 127.0.0.1:1812 1 testing123 |grep -c 'Access-Accept')
-  if [ $WORKING == 1 ]; then ret_val=0 ; fi
-fi
+  t_Log "Running Test"
+  echo "User-Name=steve,Password=centos " | radclient -x localhost:1812 auth testing123 |grep -qc 'Access-Accept'
+  ret_val=$?
 
 # Restore settings
 /bin/cp /etc/raddb/users.orig /etc/raddb/users
 rm -rf /etc/raddb/users.orig
 service radiusd restart
 
-#if (t_GetPkgRel basesystem | grep -q el5)
-#  then
-#
-#  sed -i 's/#\ INCLUDE\ eap\.conf/\ \ INCLUDE eap.conf/g' /etc/raddb/radiusd.conf
-#  ln -s /etc/raddb/sites-available/control-socket /etc/raddb/sites-enabled/
-#  ln -s /etc/raddb/sites-available/inner-tunnel /etc/raddb/sites-enabled/
-#  /bin/cp -a /etc/raddb/sites-available/default.orig /etc/raddb/sites-available/default
-#  rm -rf /etc/raddb/sites-available/default.orig
-#  service radiusd stop
-#fi
-
 t_CheckExitStatus $ret_val