[sheepdog] [PATCH v2] tests/func: add common header to tests

Liu Yuan namei.unix at gmail.com
Mon Aug 12 08:12:56 CEST 2013


On Mon, Aug 12, 2013 at 08:28:47AM +0900, MORITA Kazutaka wrote:
> At Mon, 12 Aug 2013 00:54:37 +0800,
> 
> > diff --git a/tests/functional/008 b/tests/functional/008
> > index 36078ce..665cb6b 100755
> > --- a/tests/functional/008
> > +++ b/tests/functional/008
> > @@ -2,22 +2,7 @@
> >  
> >  # Test doing heavy IO while confchg change
> >  
> > -seq=`basename $0`
> > -echo "QA output created by $seq"
> > -
> > -here=`pwd`
> > -tmp=/tmp/$$
> > -status=1        # failure is the default!
> > -
> > -# get standard environment, filters and checks
> > -. ./common.rc
> > -. ./common.filter
> > -
> > -if [[ "$DRIVER" == zoo* ]];then
> > -    DRIVER=${DRIVER/1000/5000}
> > -fi
> 
> Is it okay to remove this?

Yes, I have tried it with -zk.

> 
> > diff --git a/tests/functional/050 b/tests/functional/050
> > index 9a94649..12a6dd8 100755
> > --- a/tests/functional/050
> > +++ b/tests/functional/050
> > @@ -2,29 +2,10 @@
> >  
> >  # Test IO NIC function
> >  
> > -seq=`basename $0`
> > -echo "QA output created by $seq"
> > -
> > -here=`pwd`
> > -tmp=/tmp/$$
> > -status=1        # failure is the default!
> > -
> > -trap "_uninit; exit \$status" 0 1 2 3 15
> > -
> > -# get standard environment, filters and checks
> > -. ./common.rc
> > -. ./common.filter
> > +. ./common
> >  
> >  _need_to_be_root
> >  
> > -_uninit()
> > -{
> > -	iptables -D INPUT -p tcp --sport 8001 -j DROP
> > -	iptables -D INPUT -p tcp --dport 8001 -j DROP
> > -}
> > -
> 
> I don't this we can remove this.
> 
> 
> > diff --git a/tests/functional/057 b/tests/functional/057
> > index 3c23e51..8092312 100755
> > --- a/tests/functional/057
> > +++ b/tests/functional/057
> > @@ -1,25 +1,11 @@
> >  #!/bin/bash
> >  
> >  # Test md hot-plug and hot-unplug
> > -seq=`basename $0`
> > -echo "QA output created by $seq"
> >  
> > -here=`pwd`
> > -tmp=/tmp/$$
> > -status=1        # failure is the default!
> > -
> > -# get standard environment, filters and checks
> > -. ./common.rc
> > -. ./common.filter
> > +. ./common
> >  
> >  MD=true
> >  
> > -if [ "$STORE" != "/tmp/sheepdog/057" ]; then
> > -    _notrun "This test cannot be run when WD is manually set"
> > -fi
> 
> This is necessary, too.
> 

Umm, I'll add them back. These are removed by my sed script wrongly.

Thanks
Yuan


More information about the sheepdog mailing list