From e9f3b075516461b1cce7e382cc293f64717f3058 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Jan 02 2019 10:48:35 +0000 Subject: Enable git tests for c7 --- diff --git a/tests/p_git/0-install_git.sh b/tests/p_git/0-install_git.sh index 682830d..40d8bfb 100755 --- a/tests/p_git/0-install_git.sh +++ b/tests/p_git/0-install_git.sh @@ -5,7 +5,7 @@ t_Log "Running $0 - installing git" # Install git -if [ $centos_ver == '6' ] +if [ $centos_ver -ge 6 ] then t_InstallPackage git else diff --git a/tests/p_git/10-test_git.sh b/tests/p_git/10-test_git.sh index 719ea91..79ac9c3 100755 --- a/tests/p_git/10-test_git.sh +++ b/tests/p_git/10-test_git.sh @@ -6,7 +6,7 @@ t_Log "Running $0 - checking git installation" -if [ $centos_ver == '6' ] +if [ $centos_ver -ge 6 ] then git --version ret_val=$? diff --git a/tests/p_git/11-test_git_clone.sh b/tests/p_git/11-test_git_clone.sh index c748ecb..ff06766 100755 --- a/tests/p_git/11-test_git_clone.sh +++ b/tests/p_git/11-test_git_clone.sh @@ -5,7 +5,7 @@ t_Log "Running $0 - testing a local git clone operation" -if [ $centos_ver == '6' ] +if [ $centos_ver -ge 6 ] then # Testing Git clone by comparing SHAs workpath=$(pwd) @@ -18,6 +18,8 @@ if [ $centos_ver == '6' ] cd /tmp git clone $temp_repo cloned_repo cd cloned_repo + git config user.email "centos@centos.org" + git config user.name "t_functional tests" echo "hello world" > hello git add hello git commit -m "Temp commit" diff --git a/tests/p_git/12-test_git_log.sh b/tests/p_git/12-test_git_log.sh index 0c37264..22c4940 100755 --- a/tests/p_git/12-test_git_log.sh +++ b/tests/p_git/12-test_git_log.sh @@ -5,7 +5,7 @@ t_Log "Running $0 - testing git logging and commit messages" -if [ $centos_ver == '6' ] +if [ $centos_ver -ge 6 ] then # Testing git log and git commit msgs workpath=$(pwd) @@ -17,6 +17,8 @@ if [ $centos_ver == '6' ] cd /tmp git clone $temp_repo cloned_repo cd cloned_repo + git config user.email "centos@centos.org" + git config user.name "t_functional tests" echo "hello world" > hello git add hello git commit -m "Temp commit" 2>&1