Skip to contentSkip to conversation

oeqa/selftest/devtool: abort if a local workspace already exist

PATCH RESEND Superseded Julien Stephan 2 participants 4 messages Oct 24, 2023 – Oct 25, 2023

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/2 oeqa/selftest/devtool: abort if a local workspace already exist

if user run devtool selftests with a local workspacelayer the tests fail with various error such as:

- devtool.DevtoolAddTests.test_devtool_add just hangs
- devtool.DevtoolModifyTests.* fail with the following error:

ERROR: Found duplicated BBFILE_COLLECTIONS 'workspacelayer', check bblayers.conf or layer.conf to fix it. Found duplicated BBFILE_COLLECTIONS 'workspacelayer', check bblayers.conf or layer.conf to fix it.

Check if a workspacelayer exists, warn the user and abort the tests

---
 meta/lib/oeqa/selftest/cases/devtool.py | 3 +++
 1 file changed, 3 insertions(+)
meta/lib/oeqa/selftest/cases/devtool.py +3 -0
index b577f6d62a1..c36b1efa78b 100644
@@ -27,6 +27,9 @@ def setUpModule():
     corecopydir = os.path.join(templayerdir, 'core-copy')
     bblayers_conf = os.path.join(os.environ['BUILDDIR'], 'conf', 'bblayers.conf')
     edited_layers = []
+    # make sure user doesn't have a local workspace
+    result = runCmd('bitbake-layers show-layers')
+    assert "workspacelayer" not in result.output, "Devtool test suite cannot be run with a local workspace directory"
 
     # We need to take a copy of the meta layer so we can modify it and not
     # have any races against other tests that might be running in parallel

--
2.41.0

#1 lore raw

PATCH RESEND 2/2 oeqa/selftest/devtool: remove spaces on empty line

---
 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/devtool.py +1 -1
index c36b1efa78b..b5c488be8e8 100644
@@ -575,7 +575,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver
         checkvars['SRC_URI'] = url
         self._test_recipe_contents(recipefile, checkvars, [])
-
+
     def test_devtool_add_fetch_git(self):
         tempdir = tempfile.mkdtemp(prefix='devtoolqa')
         self.track_for_cleanup(tempdir)

--
2.41.0

#2 lore raw

Re: [OE-core] [RESEND PATCH 2/2] oeqa/selftest/devtool: remove spaces on empty line

Hello Julien,

Quoted 10 lines · On Tue, 24 Oct 2023 16:17:54 +0200 "Julien Stephan" <[email protected]>…
---
 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/devtool.py +0 -0
index c36b1efa78b..b5c488be8e8 100644

meta/lib/oeqa/selftest/cases/devtool.py class DevtoolAddTests(DevtoolBase): · line 578

Quoted 5 lines
meta/lib/oeqa/selftest/cases/devtool.py +1 -1
@@ -575,7 +575,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver
         checkvars['SRC_URI'] = url
         self._test_recipe_contents(recipefile, checkvars, [])
-
+

This patch does not apply due to the '-' line above having no spaces after '-'. Perhaps your mailer mangled the content removing training whitespace (which, ironically, is what the patch itself aims at doing!).

Using 'git send-email' is usually the best way to send patches without this sort of issues.

Luca

Signature · 3 lines
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

Re: [OE-core] [RESEND PATCH 2/2] oeqa/selftest/devtool: remove spaces on empty line

Quoted 26 lines · Luca Ceresoli

Hello Julien,

Quoted 10 lines · On Tue, 24 Oct 2023 16:17:54 +0200 "Julien Stephan" <[email protected]>…
---
 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/devtool.py +0 -0
index c36b1efa78b..b5c488be8e8 100644

meta/lib/oeqa/selftest/cases/devtool.py class DevtoolAddTests(DevtoolBase): · line 578

Quoted 5 lines
meta/lib/oeqa/selftest/cases/devtool.py +1 -1
@@ -575,7 +575,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver
         checkvars['SRC_URI'] = url
         self._test_recipe_contents(recipefile, checkvars, [])
-
+

This patch does not apply due to the '-' line above having no spaces after '-'. Perhaps your mailer mangled the content removing training whitespace (which, ironically, is what the patch itself aims at doing!).

Quoted 3 lines

Using 'git send-email' is usually the best way to send patches without this sort of issues.

Hi Luca

My editor mangled it.. I just resent it again.

Thank you

Cheers
Julien

Quoted 6 lines

Luca

--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com