diff options
Diffstat (limited to 'bitbake/lib/bb/tests/data.py')
-rw-r--r-- | bitbake/lib/bb/tests/data.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py index 2bd481b5d7..a17245f90a 100644 --- a/bitbake/lib/bb/tests/data.py +++ b/bitbake/lib/bb/tests/data.py | |||
@@ -458,8 +458,11 @@ class Remote(unittest.TestCase): | |||
458 | return self.d.localkeys() | 458 | return self.d.localkeys() |
459 | def getVarHistory(self, name): | 459 | def getVarHistory(self, name): |
460 | return self.d.varhistory.variable(name) | 460 | return self.d.varhistory.variable(name) |
461 | def expandPythonRef(self, varname, expr): | 461 | def expandPythonRef(self, varname, expr, d): |
462 | varparse = bb.data_smart.VariableParse(varname, self.d) | 462 | localdata = self.d.createCopy() |
463 | for key in d.localkeys(): | ||
464 | localdata.setVar(d.getVar(key)) | ||
465 | varparse = bb.data_smart.VariableParse(varname, localdata) | ||
463 | return varparse.python_sub(expr) | 466 | return varparse.python_sub(expr) |
464 | def setVar(self, name, value): | 467 | def setVar(self, name, value): |
465 | self.d.setVar(name, value) | 468 | self.d.setVar(name, value) |
@@ -483,3 +486,6 @@ class Remote(unittest.TestCase): | |||
483 | # Test setVar on client side affects server | 486 | # Test setVar on client side affects server |
484 | d2.setVar('HELLO', 'other-world') | 487 | d2.setVar('HELLO', 'other-world') |
485 | self.assertEqual(d1.getVar('HELLO'), 'other-world') | 488 | self.assertEqual(d1.getVar('HELLO'), 'other-world') |
489 | # Test client side data is incorporated in python expansion (which is done on server) | ||
490 | d2.setVar('FOO', 'bar') | ||
491 | self.assertEqual(d2.expand('${@d.getVar("FOO")}'), 'bar') | ||