sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-18 12:06:08 +00:00
Code Issues Releases Wiki Activity

utils/types: fix toggle_set creation

Browse Source 
Correctly handle the presence of both an element and its toggle in the
input, and handle them base on order, e.g.

toggle_set(['x', 'y', '~x']) --> {'y', '~x'}
toggle_set(['~x', 'y', 'x']) --> {'y', 'x'}
This commit is contained in:
Sergei Trofimov 2020-02-19 16:02:03 +00:00 committed by Marc Bonnici
parent 0f2de5f951
commit 5f00a94121
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_utils.py
View File

@ -190,3 +190,10 @@ class TestToggleSet(TestCase):
ts6 = ts2.merge_into(ts3).merge_with(ts1)
assert_equal(ts6, toggle_set(['one', 'two', 'three', 'four', 'five', '~~']))
def test_order_on_create(self):
ts1 = toggle_set(['one', 'two', 'three', '~one'])
assert_equal(ts1, toggle_set(['~one', 'two', 'three']))
ts1 = toggle_set(['~one', 'two', 'three', 'one'])
assert_equal(ts1, toggle_set(['one', 'two', 'three']))

8
wa/utils/types.py
View File

@ -432,6 +432,14 @@ class toggle_set(set):
if isinstance(value, str):
msg = 'invalid type for toggle_set: "{}"'
raise TypeError(msg.format(type(value)))
updated_value = []
for v in value:
if v.startswith('~') and v[1:] in updated_value:
updated_value.remove(v[1:])
elif not v.startswith('~') and ('~' + v) in updated_value:
updated_value.remove(('~' + v))
updated_value.append(v)
args = tuple([updated_value] + list(args[1:]))
set.__init__(self, *args)
def merge_with(self, other):