From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 9 Dec 2016 08:22:44 +0000 (-0800)
Subject: selftest/recipetool.py: set srcrev for recipetool create
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Frbt%2Fjethro-next;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---

diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index b1f1d2ab900..d15820c3b4e 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -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'