From: Alexandre Truong Date: Thu, 4 Apr 2024 12:25:55 +0000 (+0200) Subject: oeqa/selftest/devtool: fix test_devtool_add_git_style2 X-Git-Tag: 2024-04-scarthgap~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ac737fbe05c85ec8333b396ce2f89de6654916f;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git oeqa/selftest/devtool: fix test_devtool_add_git_style2 The problem is the following: AssertionError: 'gitsm://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master' != 'git://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master' Mbedlts made changes to their repository, adding a sub-module, thus the assert triggers an error with the url: git://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master https://github.com/Mbed-TLS/mbedtls/commit/456a54da8ef44c8b725b524567c08cffec6a7214 was the upstream change. To fix the issue, the url has been changed to: gitsm://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master Signed-off-by: Alexandre Truong Reviewed-by: Yoann Congal Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index a1cccc39ebc..bc1e40ef834 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -482,7 +482,7 @@ class DevtoolAddTests(DevtoolBase): pn = 'mbedtls' # this will trigger reformat_git_uri with branch parameter in url git_url = "'git://git@github.com/ARMmbed/mbedtls.git;protocol=https'" - resulting_src_uri = "git://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master" + resulting_src_uri = "gitsm://git@github.com/ARMmbed/mbedtls.git;protocol=https;branch=master" self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri) def test_devtool_add_library(self):