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

Tests: ls portability regarding dot-files

Browse Source 
When run as root, BSD ls(1) lists dot-files, which includes
.glusterfs in split-brain-healing.t's usage. This leads to failure.
gfid-self-heal.t suffers the same problem.

Fix by filtering out dot-files in ls(1) output

NB: split-brain-healing.t also requires http://review.gluster.org/9831
to pass on NetBSD.

BUG: 1129939
Change-Id: Ic572d3abf685e9b43f32ddee8a13b5f5c4ae641f
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/9885
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Emmanuel Dreyfus 2015-03-17 20:40:58 +01:00 committed by Kaleb KEITHLEY
parent 89cb6bcc73
commit dde946f72a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/basic/afr/gfid-self-heal.t
View File

@ -17,7 +17,7 @@ TEST $CLI volume start $V0
TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
#Test that readdir returns entries even when no gfids are present
EXPECT 4 echo $(ls -l $M0 | grep -vi total | wc -l)
EXPECT 4 echo $(ls $M0 | grep -v '^\.' | wc -l)
sleep 2;
#stat the files and check that the files have same gfids on the bricks now
TEST stat $M0/1

4
tests/basic/afr/split-brain-healing.t
View File

@ -40,8 +40,8 @@ do
echo "Initial content">>file$i
done
replica_0_files_list=(`ls $B0/${V0}1`)
replica_1_files_list=(`ls $B0/${V0}3`)
replica_0_files_list=(`ls $B0/${V0}1|grep -v '^\.'`)
replica_1_files_list=(`ls $B0/${V0}3|grep -v '^\.'`)
############ Create data split-brain in the files. ###########################
TEST kill_brick $V0 $H0 $B0/${V0}1