On Wed, 23 Dec 2015 13:48:29 Ross Burton wrote: > The devtool and recipetool tests do literal string comparisons, but for some > fields the ordering could be irrelevant and potentially non-deterministic. > For example, the recipetool_create_simple test started failing with: > > AssertionError: 'GPLv2 Unknown' != 'Unknown GPLv2' : values for LICENSE do > not match > > The ordering of the LICENSE field isn't relevant. So, if the expected value > is a set(), split the string into a set too and compare those. > > Signed-off-by: Ross Burton <[email protected]> > --- > meta/lib/oeqa/selftest/devtool.py | 2 ++ > meta/lib/oeqa/selftest/recipetool.py | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/meta/lib/oeqa/selftest/devtool.py > b/meta/lib/oeqa/selftest/devtool.py index 6f76ce7..1eadd6b 100644 > --- a/meta/lib/oeqa/selftest/devtool.py > +++ b/meta/lib/oeqa/selftest/devtool.py > @@ -44,6 +44,8 @@ class DevtoolBase(oeSelfTest): > needvalue = checkvars.pop(var) > if needvalue is None: > self.fail('Variable %s should not appear in > recipe') + if isinstance(needvalue, set): > + value = set(value.split()) > self.assertEqual(value, needvalue, 'values for %s do > not match' % var) > > > diff --git a/meta/lib/oeqa/selftest/recipetool.py > b/meta/lib/oeqa/selftest/recipetool.py index 34e383f..85a40f7 100644 > --- a/meta/lib/oeqa/selftest/recipetool.py > +++ b/meta/lib/oeqa/selftest/recipetool.py > @@ -413,7 +413,7 @@ class RecipetoolTests(RecipetoolBase): > self.fail('recipetool did not create recipe file; output:\n%s' > % result.output) self.assertEqual(dirlist[0], 'socat_%s.bb' % pv, 'Recipe > file incorrectly named') checkvars = {} > - checkvars['LICENSE'] = 'Unknown GPLv2' > + checkvars['LICENSE'] = set(['Unknown', 'GPLv2']) > checkvars['LIC_FILES_CHKSUM'] = > 'file://COPYING.OpenSSL;md5=5c9bccc77f67a8328ef4ebaf468116f4 > file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263' # We don't check > DEPENDS since they are variable for this recipe depending on what's in the > sysroot checkvars['S'] = None
Acked-by: Paul Eggleton <[email protected]> Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
