RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-disk: fix false positive for gitbuilder

Browse Source 
The output of test/ceph-disk.sh is very verbose which is good for
debugging errors. However it sometime contains strings that match
/error:/i which is picked by gitbuilder as a sign that the test fail,
even when the exit code is zero.

Remove from the output the three strings triggering false positive in
gitbuilder.

Signed-off-by: Loic Dachary <loic@dachary.org>
This commit is contained in:
Loic Dachary 2014-01-03 22:52:55 +01:00
parent 312107876c
commit c772b6d148
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/ceph-disk.sh
View File

@ -148,7 +148,7 @@ function test_activate_dir_magic() {
mkdir -p $osd_data/fsid mkdir -p $osd_data/fsid
CEPH_ARGS="--fsid $uuid" \ CEPH_ARGS="--fsid $uuid" \
./ceph-disk $CEPH_DISK_ARGS prepare $osd_data 2>&1 | tee $DIR/out ./ceph-disk $CEPH_DISK_ARGS prepare $osd_data > $DIR/out 2>&1
grep --quiet 'Is a directory' $DIR/out || return 1 grep --quiet 'Is a directory' $DIR/out || return 1
! [ -f $osd_data/magic ] || return 1 ! [ -f $osd_data/magic ] || return 1
rmdir $osd_data/fsid rmdir $osd_data/fsid
@ -200,8 +200,8 @@ function test_find_cluster_by_uuid() {
setup setup
rm $DIR/ceph.conf rm $DIR/ceph.conf
test_activate_dir 2>&1 | tee $DIR/test_find test_activate_dir > $DIR/test_find 2>&1
grep "No cluster conf found in $DIR" $DIR/test_find || return 1 grep --quiet "No cluster conf found in $DIR" $DIR/test_find || return 1
teardown teardown
} }