J. Bruce Fields :
> On Thu, Mar 03, 2011 at 05:07:09PM +0800, Mi Jinlong wrote:
>>
>> J. Bruce Fields :
>>> On Wed, Mar 02, 2011 at 02:27:22PM +0800, Mi Jinlong wrote:
>>>> Signed-off-by: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx>
>>>> ---
>>>> nfs4.1/server41tests/st_exchange_id.py | 26 ++++++++++++++++++++++++++
>>>> 1 files changed, 26 insertions(+), 0 deletions(-)
>>>>
>>>> diff --git a/nfs4.1/server41tests/st_exchange_id.py b/nfs4.1/server41tests/st_exchange_id.py
>>>> index b5e34e6..85f3092 100644
>>>> --- a/nfs4.1/server41tests/st_exchange_id.py
>>>> +++ b/nfs4.1/server41tests/st_exchange_id.py
>>>> @@ -1,5 +1,6 @@
>>>> from nfs4_const import *
>>>> import nfs4_ops as op
>>>> +import time
>>>> from environment import check, fail
>>>> from nfs4_type import *
>>>> from rpc import RPCAcceptError, GARBAGE_ARGS, RPCTimeout
>>>> @@ -436,3 +437,28 @@ def testNotOnlyOp(t, env):
>>>> res = c.compound([op.exchange_id(owner, 0, protect, [c.impl_id]), op.putrootfh()])
>>>> # per draft 21 18.35.3, server MUST return NFS4ERR_NOT_ONLY_OP
>>>> check(res, NFS4ERR_NOT_ONLY_OP)
>>>> +
>>>> +def testLeasePeriod(t, env):
>>>> + """Any unconfirmed record that is not confirmed within
>>>> + a lease period SHOULD be removed.
>>>> +
>>>> + FLAGS: exchange_id all
>>>> + CODE: EID9
>>>> + """
>>>> + c1 = env.c1.new_client("%s_1" % env.testname(t))
>>>> + c2 = env.c1.new_client("%s_2" % env.testname(t))
>>>> + # CREATE_SESSION
>>>> + chan_attrs = channel_attrs4(0,8192,8192,8192,128,8,[])
>>>> + time.sleep(80)
>>> Let's not hard-code any lease time. pynfs should do a getattr to find
>>> the server's lease time, and use that as the basis for calculations
>>> (we need something like the getLeaseTime in the 4.0 pynfs.)
>>>
>>> I actually usually set the server lease time to 15 seconds for testing,
>>> just to make the tests go faster....
>> Agree with you!
>> What about the following one?
>
> Looks fine to me.
>
>> + chan_attrs = channel_attrs4(0,8192,8192,8192,128,8,[])
>> + time.sleep(lease - 10)
>
> I changed this to
>
> time.sleep(min(lease-10, 1))
>
> so it'll sill work with single-digit lease, and left it the same
> otherwise.
After testing, that's OK.
--
thanks,
Mi Jinlong
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
