diff options
author | Randy Witt <randy.e.witt@linux.intel.com> | 2016-04-06 23:55:40 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-09 23:00:46 +0100 |
commit | 7e739acfa781fd29fe030e425ecc32dc8402b896 (patch) | |
tree | 5c062f061d50662b881082af65901ad204d94652 | |
parent | e1e459e480bc6a530cec6ed2718ce52d5ef93149 (diff) | |
download | poky-7e739acfa781fd29fe030e425ecc32dc8402b896.tar.gz |
bitbake: tests/utils.py: test origvalue in a callback matches what is expected
There were no tests that verified the value of origvalue in the callback
routines used by edit_metadata(). This patch adds one for a simple
multiline variable.
(Bitbake rev: ece3a4d02d8162dee78c2062c10291b5fd625c36)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/tests/utils.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/bitbake/lib/bb/tests/utils.py b/bitbake/lib/bb/tests/utils.py index 6ded4dfd13..2f4ccf3c62 100644 --- a/bitbake/lib/bb/tests/utils.py +++ b/bitbake/lib/bb/tests/utils.py | |||
@@ -23,6 +23,7 @@ import unittest | |||
23 | import bb | 23 | import bb |
24 | import os | 24 | import os |
25 | import tempfile | 25 | import tempfile |
26 | import re | ||
26 | 27 | ||
27 | class VerCmpString(unittest.TestCase): | 28 | class VerCmpString(unittest.TestCase): |
28 | 29 | ||
@@ -377,6 +378,27 @@ do_functionname() { | |||
377 | self.assertTrue(updated, 'List should be updated but isn\'t') | 378 | self.assertTrue(updated, 'List should be updated but isn\'t') |
378 | self.assertEqual(newlines, newfile5.splitlines(True)) | 379 | self.assertEqual(newlines, newfile5.splitlines(True)) |
379 | 380 | ||
381 | # Make sure the orig value matches what we expect it to be | ||
382 | def test_edit_metadata_origvalue(self): | ||
383 | origfile = """ | ||
384 | MULTILINE = " stuff \\ | ||
385 | morestuff" | ||
386 | """ | ||
387 | expected_value = "stuff morestuff" | ||
388 | global value_in_callback | ||
389 | value_in_callback = "" | ||
390 | |||
391 | def handle_var(varname, origvalue, op, newlines): | ||
392 | global value_in_callback | ||
393 | value_in_callback = origvalue | ||
394 | return (origvalue, op, -1, False) | ||
395 | |||
396 | bb.utils.edit_metadata(origfile.splitlines(True), | ||
397 | ['MULTILINE'], | ||
398 | handle_var) | ||
399 | |||
400 | testvalue = re.sub('\s+', ' ', value_in_callback.strip()) | ||
401 | self.assertEqual(expected_value, testvalue) | ||
380 | 402 | ||
381 | class EditBbLayersConf(unittest.TestCase): | 403 | class EditBbLayersConf(unittest.TestCase): |
382 | 404 | ||