[PATCH 1/4] CI: Fix getVars API self checks

[Anton Mikanovich <amikan@ilbers.de>]

Fix bitbake lock filename and add init calling check to make getVars
API more stable.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 testsuite/cibuilder.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index bb62bb8d..a5b57a3c 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -254,6 +254,7 @@ class CIBuilder(Test):
         return env['LAYERDIR_' + layer].strip('"')
 
     def getVars(self, *vars, target=None):
+        self.check_init()
         def fixStream(stream):
             # fix stream objects to emulate _io.TextIOWrapper
             stream.isatty = lambda: False
@@ -264,7 +265,8 @@ class CIBuilder(Test):
         fixStream(sys.stdout)
         fixStream(sys.stderr)
 
-        lockfile = os.path.join(self.build_dir, 'bitbake.lock2')
+        # wait until previous bitbake will be finished
+        lockfile = os.path.join(self.build_dir, 'bitbake.lock')
         checks = 0
         while os.path.exists(lockfile) and checks < 5:
             time.sleep(1)
@@ -276,11 +278,11 @@ class CIBuilder(Test):
                 tinfoil.prepare(quiet=2)
                 d = tinfoil.parse_recipe(target)
                 for var in vars:
-                    values = values + (d.getVar(var),)
+                    values = values + (d.getVar(var, True) or 'None',)
             else:
                 tinfoil.prepare(config_only=True, quiet=2)
                 for var in vars:
-                    values = values + (tinfoil.config_data.getVar(var),)
+                    values = values + (tinfoil.config_data.getVar(var, True) or 'None',)
             return values if len(values) > 1 else values[0]
 
     def create_tmp_layer(self):
-- 
2.34.1