summaryrefslogtreecommitdiff
path: root/unittests/optiontests.py
diff options
context:
space:
mode:
Diffstat (limited to 'unittests/optiontests.py')
-rw-r--r--unittests/optiontests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/unittests/optiontests.py b/unittests/optiontests.py
index 617988843..428b82ebb 100644
--- a/unittests/optiontests.py
+++ b/unittests/optiontests.py
@@ -260,7 +260,7 @@ class OptionTests(unittest.TestCase):
cmd_line = {key: opt_value}
optstore.initialize_from_top_level_project_call({}, cmd_line, {})
- self.assertEqual(optstore.get_value_object_and_value_for(key.as_build())[1], opt_value)
+ self.assertEqual(optstore.get_option_and_value_for(key.as_build())[1], opt_value)
self.assertEqual(optstore.get_value_for(key.as_build()), opt_value)
def test_build_to_host_subproject(self):
@@ -279,7 +279,7 @@ class OptionTests(unittest.TestCase):
spcall = {key: opt_value}
optstore.initialize_from_top_level_project_call({}, {}, {})
optstore.initialize_from_subproject_call(subp, spcall, {}, {}, {})
- self.assertEqual(optstore.get_value_object_and_value_for(key.evolve(subproject=subp,
+ self.assertEqual(optstore.get_option_and_value_for(key.evolve(subproject=subp,
machine=MachineChoice.BUILD))[1], opt_value)
self.assertEqual(optstore.get_value_for(key.evolve(subproject=subp,
machine=MachineChoice.BUILD)), opt_value)
@@ -301,8 +301,8 @@ class OptionTests(unittest.TestCase):
optstore.initialize_from_top_level_project_call({}, cmd_line, {})
print(optstore.options)
- self.assertEqual(optstore.get_value_object_and_value_for(key)[1], opt_value)
- self.assertEqual(optstore.get_value_object_and_value_for(key.as_build())[1], def_value)
+ self.assertEqual(optstore.get_option_and_value_for(key)[1], opt_value)
+ self.assertEqual(optstore.get_option_and_value_for(key.as_build())[1], def_value)
self.assertEqual(optstore.get_value_for(key), opt_value)
self.assertEqual(optstore.get_value_for(key.as_build()), def_value)