[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5140/8267] bitbake: tests/data: Add inactive remove override test

[Emmanuele Bassi <ebassi src gnome org>]

commit da577c7d37a0e35f948370da333306aea2cef5cc
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Thu Mar 16 12:53:15 2017 +0000

    bitbake: tests/data: Add inactive remove override test
    
    In 2bc4d35fb32defc59cd6ed1fc87e35924c201a5c we fixed cases where an inactive
    remove override was influecing the value of a variable. This adds a test
    case for this issue.
    
    (Bitbake rev: 1ff9b3c669fa187f152de7b8b57d14c2468d926c)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/tests/data.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py
index be46ffc..895489e 100644
--- a/bitbake/lib/bb/tests/data.py
+++ b/bitbake/lib/bb/tests/data.py
@@ -283,6 +283,13 @@ class TestConcatOverride(unittest.TestCase):
         self.d.setVar("TEST_remove", "val")
         self.assertEqual(self.d.getVar("TEST"), "bar")
 
+    # Ensure the value is unchanged if we have an inactive remove override
+    # (including that whitespace is preserved)
+    def test_remove_inactive_override(self):
+        self.d.setVar("TEST", "${VAL} ${BAR}    123")
+        self.d.setVar("TEST_remove_inactiveoverride", "val")
+        self.assertEqual(self.d.getVar("TEST"), "val bar    123")
+
     def test_doubleref_remove(self):
         self.d.setVar("TEST", "${VAL} ${BAR}")
         self.d.setVar("TEST_remove", "val")