[oe-commits] [openembedded-core] 01/01: devtool.py: track to clean devtool.conf in test_create_workspace

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit a0a96db23686a38235fb0373e75e8b2951216c18
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Wed Jul 3 11:39:48 2019 +0800

    devtool.py: track to clean devtool.conf in test_create_workspace
    
    `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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.