From 66dad5422570034281c81097fd3e46f039413cc8 Mon Sep 17 00:00:00 2001
From: Athmane Madjoudj <athmane@fedoraproject.org>
Date: Aug 29 2011 15:11:53 +0000
Subject: Fix anaconda and centos-release test on C5


---

diff --git a/tests/p_anaconda/anaconda_centos_patch.sh b/tests/p_anaconda/anaconda_centos_patch.sh
index 50247ce..338878f 100755
--- a/tests/p_anaconda/anaconda_centos_patch.sh
+++ b/tests/p_anaconda/anaconda_centos_patch.sh
@@ -7,8 +7,7 @@ ANACONDA_PATH=/usr/lib/anaconda/
 
 (grep "id = \"centos\"" $ANACONDA_PATH/installclasses/rhel.py >/dev/null 2>&1) &&\
 
-(grep "name = N_(\"CentOS Linux\")" $ANACONDA_PATH/installclasses/rhel.py >/dev/null 2>&1) &&\
+(grep "name = N_(\"CentOS Linux\")" $ANACONDA_PATH/installclasses/rhel.py >/dev/null 2>&1) 
 
-(grep "\"CentOS\": (\"CentOS release\", )," $ANACONDA_PATH/installclasses/rhel.py >/dev/null 2>&1) 
 
 t_CheckExitStatus $?
diff --git a/tests/p_centos-release/centos-release_release_compat_symlinks.sh b/tests/p_centos-release/centos-release_release_compat_symlinks.sh
index d7c5ed1..c8357af 100755
--- a/tests/p_centos-release/centos-release_release_compat_symlinks.sh
+++ b/tests/p_centos-release/centos-release_release_compat_symlinks.sh
@@ -2,9 +2,15 @@
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
 t_Log "Running $0 - /etc/centos-release compatibility symbolic links test."
+if (t_GetPkgRel basesystem | grep -q el6)
+then
 
 grep "CentOS" /etc/centos-release >/dev/null 2>&1
 (file /etc/redhat-release | grep "symbolic link to .centos-release."  >/dev/null 2>&1) &&\
 (file /etc/system-release | grep "symbolic link to .centos-release."  >/dev/null 2>&1)
 
+else
+   echo "This test is not comptatible with CentOS <= 5"
+fi
+
 t_CheckExitStatus $?
diff --git a/tests/p_centos-release/centos-release_system_release.sh b/tests/p_centos-release/centos-release_system_release.sh
index 9db3ca8..ed93397 100755
--- a/tests/p_centos-release/centos-release_system_release.sh
+++ b/tests/p_centos-release/centos-release_system_release.sh
@@ -2,7 +2,10 @@
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
 t_Log "Running $0 - /etc/centos-release has correct info test."
-
-grep "CentOS" /etc/centos-release >/dev/null 2>&1
-
+if (t_GetPkgRel basesystem | grep -q el6)
+then
+    grep "CentOS" /etc/centos-release >/dev/null 2>&1
+else
+    grep "CentOS" /etc/redhat-release >/dev/null 2>&1
+fi
 t_CheckExitStatus $?
diff --git a/tests/p_samba/samba_share_test.sh b/tests/p_samba/samba_share_test.sh
index e408605..86b3ec3 100755
--- a/tests/p_samba/samba_share_test.sh
+++ b/tests/p_samba/samba_share_test.sh
@@ -20,7 +20,7 @@ EOF
 
 # Reload the config
 service smb restart
-
+sleep 2
 
 mkdir -p /srv/smb
 echo "SMB test file" > /srv/smb/test.txt