[OE-core] [PATCH] lib/oeqa/selftest/bblayers: improve test for add-layer and remove-layer

[Yi Zhao]

在 2015年04月10日 08:22, Khem Raj 写道:
>> On Apr 9, 2015, at 12:10 AM, Yi Zhao <yi.zhao at windriver.com> wrote:
>>
>> Use absolute path instead of relative path for meta-skeleton.
>> Otherwise the case would fail if the builddir outside the poky source
>> tree.
> may be you should say ‘OE-Core’ sources instead here.

Thanks,  Khem. Strictly speaking it should be OE-Core.

Yi

>
>> Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
>> ---
>> meta/lib/oeqa/selftest/bblayers.py |    9 +++++----
>> 1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py
>> index 5b046d0..3a18029 100644
>> --- a/meta/lib/oeqa/selftest/bblayers.py
>> +++ b/meta/lib/oeqa/selftest/bblayers.py
>> @@ -6,7 +6,7 @@ import shutil
>>
>> import oeqa.utils.ftools as ftools
>> from oeqa.selftest.base import oeSelfTest
>> -from oeqa.utils.commands import runCmd
>> +from oeqa.utils.commands import runCmd, get_bb_var
>> from oeqa.utils.decorators import testcase
>>
>> class BitbakeLayers(oeSelfTest):
>> @@ -44,15 +44,16 @@ class BitbakeLayers(oeSelfTest):
>>          self.assertTrue(find_in_contents)
>>
>>      def test_bitbakelayers_add_remove(self):
>> +        test_layer = os.path.join(get_bb_var('COREBASE'), 'meta-skeleton')
>>          result = runCmd('bitbake-layers show-layers')
>>          self.assertNotIn('meta-skeleton', result.output, 'This test cannot run with meta-skeleton in bblayers.conf')
>> -        result = runCmd('bitbake-layers add-layer ../meta-skeleton')
>> +        result = runCmd('bitbake-layers add-layer %s' % test_layer)
>>          result = runCmd('bitbake-layers show-layers')
>>          self.assertIn('meta-skeleton', result.output)
>> -        result = runCmd('bitbake-layers remove-layer ../meta-skeleton')
>> +        result = runCmd('bitbake-layers remove-layer %s' % test_layer)
>>          result = runCmd('bitbake-layers show-layers')
>>          self.assertNotIn('meta-skeleton', result.output)
>> -        result = runCmd('bitbake-layers add-layer ../meta-skeleton')
>> +        result = runCmd('bitbake-layers add-layer %s' % test_layer)
>>          result = runCmd('bitbake-layers show-layers')
>>          self.assertIn('meta-skeleton', result.output)
>>          result = runCmd('bitbake-layers remove-layer */meta-skeleton')
>> -- 
>> 1.7.9.5
>>
>> -- 
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>