[PATCH 0/1] devtool.py: track to clean devtool.conf in test_create_workspace

[PATCH 0/1] devtool.py: track to clean devtool.conf in test_create_workspace

[Chen Qi]

*** BLURB HERE ***
The following changes since commit 1c6b1f926c600a61dbccf9653591084357a2e740:

  bzip2: update to 1.0.7 (2019-07-02 22:01:15 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib ChenQi/devtool-conf
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/devtool-conf

Chen Qi (1):
  devtool.py: track to clean devtool.conf in test_create_workspace

 meta/lib/oeqa/selftest/cases/devtool.py | 3 +++
 1 file changed, 3 insertions(+)

-- 
1.9.1

[PATCH 1/1] devtool.py: track to clean devtool.conf in test_create_workspace

[Chen Qi]

`devtool create-workspace' would create devtool.conf, so track to
clean it up. Otherwise, this devtool.conf file would mess things up.

e.g.
oe-selftest -r devtool && oe-selftest -r devtool -j 2
AssertionError: '/PROJ_DIR/build-selftest-st-15753/workspace/conf/layer.conf' does not exist : Workspace directory not created

This is because the devtool.conf is also copied to build-selftest-st-xxxx
directory, resulting in devtool to create and use workspace specified
in this file.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/lib/oeqa/selftest/cases/devtool.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 904ff69..6fe145c 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -240,6 +240,9 @@ class DevtoolTests(DevtoolBase):
         # Check preconditions
         result = runCmd('bitbake-layers show-layers')
         self.assertTrue('\nworkspace' not in result.output, 'This test cannot be run with a workspace layer in bblayers.conf')
+        # remove conf/devtool.conf to avoid it corrupting tests
+        devtoolconf = os.path.join(self.builddir, 'conf', 'devtool.conf')
+        self.track_for_cleanup(devtoolconf)
         # Try creating a workspace layer with a specific path
         tempdir = tempfile.mkdtemp(prefix='devtoolqa')
         self.track_for_cleanup(tempdir)
-- 
1.9.1