diff options
Diffstat (limited to 'tests/bugs')
| -rwxr-xr-x | tests/bugs/distribute/bug-907072.t | 18 | ||||
| -rwxr-xr-x | tests/bugs/distribute/bug-921408.t | 4 | ||||
| -rwxr-xr-x | tests/bugs/glusterd/bug-1070734.t | 7 |
3 files changed, 17 insertions, 12 deletions
diff --git a/tests/bugs/distribute/bug-907072.t b/tests/bugs/distribute/bug-907072.t index 1e8bd280f32..a4d98831380 100755 --- a/tests/bugs/distribute/bug-907072.t +++ b/tests/bugs/distribute/bug-907072.t @@ -17,10 +17,11 @@ TEST glusterfs -s $H0 --volfile-id $V0 $M0; TEST mkdir $M0/test; -OLD_LAYOUT0=`get_layout $B0/${V0}0/test`; -OLD_LAYOUT1=`get_layout $B0/${V0}1/test`; -OLD_LAYOUT2=`get_layout $B0/${V0}2/test`; -OLD_LAYOUT3=`get_layout $B0/${V0}3/test`; +# Extract the layout sans the commit hash +OLD_LAYOUT0=`get_layout $B0/${V0}0/test | cut -c11-34`; +OLD_LAYOUT1=`get_layout $B0/${V0}1/test | cut -c11-34`; +OLD_LAYOUT2=`get_layout $B0/${V0}2/test | cut -c11-34`; +OLD_LAYOUT3=`get_layout $B0/${V0}3/test | cut -c11-34`; TEST killall glusterfsd; @@ -36,10 +37,11 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 TEST glusterfs -s $H0 --volfile-id $V0 $M0; TEST stat $M0/test; -NEW_LAYOUT0=`get_layout $B0/${V0}0/test`; -NEW_LAYOUT1=`get_layout $B0/${V0}1/test`; -NEW_LAYOUT2=`get_layout $B0/${V0}2/test`; -NEW_LAYOUT3=`get_layout $B0/${V0}3/test`; +# Extract the layout sans the commit hash +NEW_LAYOUT0=`get_layout $B0/${V0}0/test | cut -c11-34`; +NEW_LAYOUT1=`get_layout $B0/${V0}1/test | cut -c11-34`; +NEW_LAYOUT2=`get_layout $B0/${V0}2/test | cut -c11-34`; +NEW_LAYOUT3=`get_layout $B0/${V0}3/test | cut -c11-34`; EXPECT $OLD_LAYOUT0 echo $NEW_LAYOUT0; EXPECT $OLD_LAYOUT1 echo $NEW_LAYOUT1; diff --git a/tests/bugs/distribute/bug-921408.t b/tests/bugs/distribute/bug-921408.t index b1887f8ae22..559114bb85a 100755 --- a/tests/bugs/distribute/bug-921408.t +++ b/tests/bugs/distribute/bug-921408.t @@ -37,7 +37,7 @@ addbr_rebal_till_layout_change() then break fi - NEW_LAYOUT=`get_layout $B0/${V0}0` + NEW_LAYOUT=`get_layout $B0/${V0}0 | cut -c11-34` if [ $OLD_LAYOUT == $NEW_LAYOUT ] then i=`expr $i + 1`; @@ -64,7 +64,7 @@ TEST touch $M0/test/test fd=`fd_available` TEST fd_open $fd "rw" $M0/test/test -OLD_LAYOUT=`get_layout $B0/${V0}0` +OLD_LAYOUT=`get_layout $B0/${V0}0 | cut -c11-34` addbr_rebal_till_layout_change 1 diff --git a/tests/bugs/glusterd/bug-1070734.t b/tests/bugs/glusterd/bug-1070734.t index b5a53c24cab..5db60e0cfe6 100755 --- a/tests/bugs/glusterd/bug-1070734.t +++ b/tests/bugs/glusterd/bug-1070734.t @@ -65,8 +65,11 @@ TEST [ -f ${OTHERBRICK}/DIR/file ] #Check the DIR on HASHED should have got zeroed layout and the \ #OTHERBRICK should have got full layout -EXPECT "0x00000001000000000000000000000000" dht_get_layout $HASHED/DIR ; -EXPECT "0x000000010000000000000000ffffffff" dht_get_layout $OTHERBRICK/DIR; +shorter_layout () { + dht_get_layout $1 | cut -c 19- +} +EXPECT "0000000000000000" shorter_layout $HASHED/DIR ; +EXPECT "00000000ffffffff" shorter_layout $OTHERBRICK/DIR; ## Before killing daemon to avoid deadlocks EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0 |