From a075bf502eedf41aa76b50597d05111a7bb3eaf8 Mon Sep 17 00:00:00 2001 From: Vyacheslav Yurkov Date: Tue, 16 Jan 2024 09:23:26 +0100 Subject: oeqa/selftest/recipetool: Move helper function to the class scope (From OE-Core rev: 89d37266524ca3e7c9eaf9141b30055ebc39aa76) Signed-off-by: Vyacheslav Yurkov Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/recipetool.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/lib/oeqa/selftest') diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 356bb4a746..83848d6170 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -744,14 +744,14 @@ class RecipetoolCreateTests(RecipetoolBase): def test_recipetool_create_git_srcbranch(self): self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;protocol=https', 'matchbox-keyboard-0-1') + def _go_urifiy(self, url, version, modulepath = None, pathmajor = None, subdir = None): + modulepath = ",path='%s'" % modulepath if len(modulepath) else '' + pathmajor = ",pathmajor='%s'" % pathmajor if len(pathmajor) else '' + subdir = ",subdir='%s'" % subdir if len(subdir) else '' + return "${@go_src_uri('%s','%s'%s%s%s)}" % (url, version, modulepath, pathmajor, subdir) + def test_recipetool_create_go(self): # Basic test to check go recipe generation - def urifiy(url, version, modulepath = None, pathmajor = None, subdir = None): - modulepath = ",path='%s'" % modulepath if len(modulepath) else '' - pathmajor = ",pathmajor='%s'" % pathmajor if len(pathmajor) else '' - subdir = ",subdir='%s'" % subdir if len(subdir) else '' - return "${@go_src_uri('%s','%s'%s%s%s)}" % (url, version, modulepath, pathmajor, subdir) - temprecipe = os.path.join(self.tempdir, 'recipe') os.makedirs(temprecipe) @@ -919,7 +919,7 @@ class RecipetoolCreateTests(RecipetoolBase): src_uri = set() for d in dependencies: - src_uri.add(urifiy(*d)) + src_uri.add(self._go_urifiy(*d)) checkvars = {} checkvars['GO_DEPENDENCIES_SRC_URI'] = src_uri -- cgit v1.2.3-54-g00ecf