andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: python portability

Browse Source 
Make sure to use $PYTHON defined from tests/env.rc so that we get the
path to the actually detected python interpreter.

BUG: 1129939
Change-Id: Ibf3e88f190d5e0c6a4a08e8d5ef9d0b5cba5078a
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10286
Tested-by: NetBSD Build System
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Emmanuel Dreyfus 2015-04-17 15:15:50 +02:00 committed by Vijay Bellur
parent fc451b5b0f
commit 84df19e448
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/geo-rep/geo-rep-helper.rc
View File

@ -60,7 +60,7 @@ function geo_rep_arequal_status()
echo "calculating and comparing arequal checksum between $GMV0 and \
$GSV0 " >> $LOG_FILE
python $comp_arequal $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1
$PYTHON $comp_arequal $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1
local ret=$?
# There is a bug, where sometimes metadata checksum of directories
@ -97,7 +97,7 @@ function geo_rep_filecount_status()
echo "calculating and comparing files count between $GMV0 and \
$GSV0 " >> $LOG_FILE
python $comp_arequal -c "find" $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1
$PYTHON $comp_arequal -c "find" $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1
if [ $? -eq 0 ];then
temp_status="completed"
@ -130,7 +130,7 @@ function check_status_arequal()
echo "calculating and comparing gfids between $GMV0 and $GSV0 " \
>> $LOG_FILE
python $comp_gfid $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1
$PYTHON $comp_gfid $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1
if [ $? != 0 ]; then
return 1
@ -140,7 +140,7 @@ function check_status_arequal()
echo "calculating and comparing arequal checksum between $GMV0 and $GSV0 " \
>> $LOG_FILE
python $comp_arequal $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1
$PYTHON $comp_arequal $H0::$GMV0 $H0::$GSV0 >> $LOG_FILE 2>&1
local rett=$?
@ -165,12 +165,12 @@ function create_data()
if [ $DIR_STR == "MULTI" ];then
python $create_data -n $nf --multi -b 10 -d 10 --random --max=2K \
$PYTHON $create_data -n $nf --multi -b 10 -d 10 --random --max=2K \
--min=1K -t $FILE_TYPE --fop=$fop $MNT_PNT >> $LOG_FILE 2>&1
elif [ $DIR_STR == "SINGLE" ];then
python $create_data -n $ns --random --max=2K --min=1K -t $FILE_TYPE \
$PYTHON $create_data -n $ns --random --max=2K --min=1K -t $FILE_TYPE \
--fop=$fop $MNT_PNT >> $LOG_FILE 2>&1
else