Skip to contentSkip to conversation

selftest/recipetool.py: set srcrev for recipetool create

PATCH New Robert Yang 1 participant 2 messages Dec 9, 2016

lore
Share & tools
lore
#0 lore raw

cover selftest/recipetool.py: set srcrev for recipetool create

The following changes since commit a9db40da62c13b0010ce5afc1fde16d987bdfbc6:

build-appliance-image: Update to jethro head revision (2016-12-06 22:48:36 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/jethro-next
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/jethro-next

Robert Yang (1):
selftest/recipetool.py: set srcrev for recipetool create

 meta/lib/oeqa/selftest/recipetool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.10.2
#1 lore raw

PATCH 1/1 selftest/recipetool.py: set srcrev for recipetool create

The srcrev would default to master when not set, which may cause erorrs when the source is changed.

Fixed:
======================================================================
FAIL: test_recipetool_create_git (oeqa.selftest.recipetool.RecipetoolTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/utils/decorators.py", line 106, in wrapped_f
return func(*args, **kwargs)
File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/recipetool.py", line 402, in test_recipetool_create_git
self._test_recipe_contents(recipefile, checkvars, inherits)
File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/devtool.py", line 25, in _test_recipe_contents
self.assertEqual(value, needvalue, 'values for %s do not match' % var)
AssertionError: 'Unknown LGPLv2.1' != 'LGPLv2.1' : values for LICENSE do not match

The rev=9f7cf8895ae2d39c465c04cc78e918c157420269 is taken from master branch. It was failed because libmatchbox's master branch has added a COPYING.MIT, and the testcase only checks COPYING.

---
 meta/lib/oeqa/selftest/recipetool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/recipetool.py +1 -1
index b1f1d2ab..d15820c 100644
@@ -389,7 +389,7 @@ class RecipetoolTests(RecipetoolBase):
         os.makedirs(tempsrc)
         recipefile = os.path.join(self.tempdir, 'libmatchbox.bb')
         srcuri = 'git://git.yoctoproject.org/libmatchbox'
-        result = runCmd('recipetool create -o %s %s -x %s' % (recipefile, srcuri, tempsrc))
+        result = runCmd('recipetool create -o %s "%s;rev=9f7cf8895ae2d39c465c04cc78e918c157420269" -x %s' % (recipefile, srcuri, tempsrc))
         self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
         checkvars = {}
         checkvars['LICENSE'] = 'LGPLv2.1'
Signature · 1 line
2.10.2