[sheepdog] [PATCH v2] func/test: fix some test scripts when using multi disk

[Hitoshi Mitake]

On Thu, Aug 14, 2014 at 5:54 PM, Ruoyu <liangry at ucweb.com> wrote:
>
> On 2014年08月14日 13:50, Hitoshi Mitake wrote:
>>
>> At Thu, 14 Aug 2014 10:12:26 +0800,
>> Ruoyu wrote:
>>>
>>> check script allows -md option to use multi disk for functional test.
>>> But it seems some test suites are not compatible with it. This patch
>>> fixes the problem.
>>>
>>> Test suites 010, 027, 032, 033 and 042 are involved.
>>>
>>> Signed-off-by: Ruoyu <liangry at ucweb.com>
>>> ---
>>> v2:
>>>   - add 027 to patch
>>> ---
>>>   tests/functional/010           | 6 ++++--
>>>   tests/functional/027           | 2 +-
>>>   tests/functional/032           | 9 ++++++---
>>>   tests/functional/032.out       | 6 ------
>>>   tests/functional/033           | 9 ++++++---
>>>   tests/functional/033.out       | 6 ------
>>>   tests/functional/042           | 3 ++-
>>>   tests/functional/common.filter | 5 +++++
>>>   8 files changed, 24 insertions(+), 22 deletions(-)
>>
>> On my environment, this patch couldn't applied. Below is an error
>> message:
>>
>> Applying: func/test: fix some test scripts when using multi disk
>> error: patch failed: tests/functional/032:36
>> error: tests/functional/032: patch does not apply
>> ...
>>
>> Is your tree a little bit old (yes, it is hard to think...). But the
>> 36th line:
>> _wait_for_sheep 8
>> in tests/functional/032 seems to be missing.
>
> I had incorrectly switched to stable branch to work with this patch.
> It could not be applied to master branch because the commit
> 2283dd1ffb753ca275ffbcbff3e412ce291a3a22 has not been backported.
> I will rebase a new patch ASAP, but I think the above commit is needed too.

I picked the patch. Thanks.
Hitoshi

>
>>
>> Could you rebase it on the latest master?
>>
>> Thanks,
>> Hitoshi
>>
>>
>
>
> --
> sheepdog mailing list
> sheepdog at lists.wpkg.org
> http://lists.wpkg.org/mailman/listinfo/sheepdog