summaryrefslogtreecommitdiffstats
path: root/lib/bb/tests
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 15:14:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-19 22:43:48 +0100
commit659ef95c9b8aced3c4ded81c48bcc0fbde4d429f (patch)
treec63666710636bf12d25ef5a491f5d1abbcca4f96 /lib/bb/tests
parent5ecd6a671c088f270d5f49093f8da83278fc0aa9 (diff)
downloadbitbake-contrib-659ef95c9b8aced3c4ded81c48bcc0fbde4d429f.tar.gz
bitbake: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/tests')
-rw-r--r--lib/bb/tests/data.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/bb/tests/data.py b/lib/bb/tests/data.py
index e285c223d..2c2e7ae48 100644
--- a/lib/bb/tests/data.py
+++ b/lib/bb/tests/data.py
@@ -134,12 +134,12 @@ class DataExpansions(unittest.TestCase):
def test_rename(self):
self.d.renameVar("foo", "newfoo")
- self.assertEqual(self.d.getVar("newfoo"), "value_of_foo")
- self.assertEqual(self.d.getVar("foo"), None)
+ self.assertEqual(self.d.getVar("newfoo", False), "value_of_foo")
+ self.assertEqual(self.d.getVar("foo", False), None)
def test_deletion(self):
self.d.delVar("foo")
- self.assertEqual(self.d.getVar("foo"), None)
+ self.assertEqual(self.d.getVar("foo", False), None)
def test_keys(self):
keys = self.d.keys()
@@ -196,28 +196,28 @@ class TestMemoize(unittest.TestCase):
def test_memoized(self):
d = bb.data.init()
d.setVar("FOO", "bar")
- self.assertTrue(d.getVar("FOO") is d.getVar("FOO"))
+ self.assertTrue(d.getVar("FOO", False) is d.getVar("FOO", False))
def test_not_memoized(self):
d1 = bb.data.init()
d2 = bb.data.init()
d1.setVar("FOO", "bar")
d2.setVar("FOO", "bar2")
- self.assertTrue(d1.getVar("FOO") is not d2.getVar("FOO"))
+ self.assertTrue(d1.getVar("FOO", False) is not d2.getVar("FOO", False))
def test_changed_after_memoized(self):
d = bb.data.init()
d.setVar("foo", "value of foo")
- self.assertEqual(str(d.getVar("foo")), "value of foo")
+ self.assertEqual(str(d.getVar("foo", False)), "value of foo")
d.setVar("foo", "second value of foo")
- self.assertEqual(str(d.getVar("foo")), "second value of foo")
+ self.assertEqual(str(d.getVar("foo", False)), "second value of foo")
def test_same_value(self):
d = bb.data.init()
d.setVar("foo", "value of")
d.setVar("bar", "value of")
- self.assertEqual(d.getVar("foo"),
- d.getVar("bar"))
+ self.assertEqual(d.getVar("foo", False),
+ d.getVar("bar", False))
class TestConcat(unittest.TestCase):
def setUp(self):