mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

Simplify partial map Py3 IDL test added by commit a59912a0

Browse Source 
Commit a59912a0 ("python: Add support for partial map
and partial set updates") added unit tests for the partial
map function for the python IDL.  However, because Python3
doesn't order dictionaries consistently, this
test is a crap shoot for systems that support Python3.

As a short term fix, do not use a dictionary with multiple
elements for the partial map test case.

Change-Id: Ibdec10ebd895051321b9bff7d9fe8a7e0bd9eb88
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Ryan Moats
2016-08-14 19:48:24 -05:00
committed by Ben Pfaff
parent f5792c3f36
commit 884d9bad71
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/ovsdb-idl.at
View File

@@ -1110,14 +1110,14 @@ OVSDB_CHECK_IDL_PARTIAL_UPDATE_MAP_COLUMN([map, simple2 idl-partial-update-map-c
OVSDB_CHECK_IDL_PY([partial-map idl],
[['["idltest", {"op":"insert", "table":"simple2",
"row":{"name":"myString1","smap":["map",[["key1","value1"],["key2","value2"]]]} }]']
"row":{"name":"myString1","smap":["map",[["key1","value1"]]]} }]']
],
[?simple2:name,smap,imap 'partialmapinsertelement' 'partialmapdelelement'],
[[000: name=myString1 smap={key2: value2 key1: value1} imap={}
[[000: name=myString1 smap={key1: value1} imap={}
001: commit, status=success
002: name=String2 smap={key2: value2 key1: myList1} imap={3: myids2}
002: name=String2 smap={key1: myList1} imap={3: myids2}
003: commit, status=success
004: name=String2 smap={key1: myList1} imap={3: myids2}
004: name=String2 smap={} imap={3: myids2}
005: done
]])

2
tests/test-ovsdb.py
View File

@@ -450,7 +450,7 @@ def idl_set(idl, commands, step):
row.__setattr__('name', 'String2')
elif name == 'partialmapdelelement':
row = idltest_find_simple2(idl, 'String2')
row.delkey('smap', 'key2', 'value2')
row.delkey('smap', 'key1', 'myList1')
elif name == 'partialrenamesetadd':
row = idltest_find_simple3(idl, 'mySet1')
row.addvalue('uset',