Skip to content

Commit 82a46cd

Browse files
committed
[test] Remove named function arguments from TestSBEnvironment
This is not available in all versions of swig 3.
1 parent c041451 commit 82a46cd

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

lldb/test/API/python_api/sbenvironment/TestSBEnvironment.py

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,27 @@ def test_launch_info(self):
4141
env = launch_info.GetEnvironment()
4242
env_count = env.GetNumValues()
4343

44-
env.Set("FOO", "bar", overwrite=True)
44+
env.Set("FOO", "bar", True)
4545
self.assertEqual(env.GetNumValues(), env_count + 1)
4646

4747
# Make sure we only modify the copy of the launchInfo's environment
4848
self.assertEqual(launch_info.GetEnvironment().GetNumValues(), env_count)
4949

50-
launch_info.SetEnvironment(env, append=True)
50+
# Note: swig >= 3.0.3 can use named parameters, omit to support <= 3.0.2.
51+
# i.e. launch_info.SetEnvironment(env, append=True)
52+
launch_info.SetEnvironment(env, True)
5153
self.assertEqual(launch_info.GetEnvironment().GetNumValues(), env_count + 1)
5254

53-
env.Set("FOO", "baz", overwrite=True)
54-
launch_info.SetEnvironment(env, append=True)
55+
env.Set("FOO", "baz", True)
56+
launch_info.SetEnvironment(env, True)
5557
self.assertEqual(launch_info.GetEnvironment().GetNumValues(), env_count + 1)
5658
self.assertEqual(launch_info.GetEnvironment().Get("FOO"), "baz")
5759

5860
# Make sure we can replace the launchInfo's environment
5961
env.Clear()
60-
env.Set("BAR", "foo", overwrite=True)
62+
env.Set("BAR", "foo", True)
6163
env.PutEntry("X=y")
62-
launch_info.SetEnvironment(env, append=False)
64+
launch_info.SetEnvironment(env, False)
6365
self.assertEqualEntries(launch_info.GetEnvironment(), ["BAR=foo", "X=y"])
6466

6567

@@ -87,8 +89,10 @@ def test_creating_and_modifying_environment(self):
8789
self.assertEqual(env.Get("BAR"), None)
8890

8991
# We also test empty values
90-
self.assertTrue(env.Set("FOO", "", overwrite=False))
91-
env.Set("BAR", "foo", overwrite=False)
92+
# Note: swig >= 3.0.3 can use named parameters, omit to support <= 3.0.2.
93+
# i.e. env.Set("FOO", "", overwrite=False)
94+
self.assertTrue(env.Set("FOO", "", False))
95+
env.Set("BAR", "foo", False)
9296

9397
self.assertEqual(env.Get("FOO"), "")
9498
self.assertEqual(env.Get("BAR"), "foo")
@@ -98,7 +102,7 @@ def test_creating_and_modifying_environment(self):
98102
self.assertEqualEntries(env, ["FOO=", "BAR=foo"])
99103

100104
# Make sure modifications work
101-
self.assertFalse(env.Set("FOO", "bar", overwrite=False))
105+
self.assertFalse(env.Set("FOO", "bar", False))
102106
self.assertEqual(env.Get("FOO"), "")
103107

104108
env.PutEntry("FOO=bar")
@@ -115,15 +119,15 @@ def test_creating_and_modifying_environment(self):
115119
entries = lldb.SBStringList()
116120
entries.AppendList(["X=x", "Y=y"], 2)
117121

118-
env.SetEntries(entries, append=True)
122+
env.SetEntries(entries, True)
119123
self.assertEqualEntries(env, ["BAR=foo", "X=x", "Y=y"])
120124

121-
env.SetEntries(entries, append=False)
125+
env.SetEntries(entries, False)
122126
self.assertEqualEntries(env, ["X=x", "Y=y"])
123127

124128
entries.Clear()
125129
entries.AppendList(["X=y", "Y=x"], 2)
126-
env.SetEntries(entries, append=True)
130+
env.SetEntries(entries, True)
127131
self.assertEqualEntries(env, ["X=y", "Y=x"])
128132

129133
# Test clear

0 commit comments

Comments
 (0)