diff mbox

[ovs-dev] Simplify partial map Py3 IDL test added by commit a59912a0

Message ID 1471222104-64744-1-git-send-email-rmoats@us.ibm.com
State Accepted
Headers show

Commit Message

Ryan Moats Aug. 15, 2016, 12:48 a.m. UTC 
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>
---
 tests/ovsdb-idl.at  | 8 ++++----
 tests/test-ovsdb.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Ben Pfaff Aug. 15, 2016, 3:20 a.m. UTC | #1 
On Sun, Aug 14, 2016 at 07:48:24PM -0500, Ryan Moats wrote:
> 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>

Thanks, applied.
diff mbox

Patch

diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at
index c61d2e7..b2899b6 100644
--- a/tests/ovsdb-idl.at
+++ b/tests/ovsdb-idl.at
@@ -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
 ]])
 
diff --git a/tests/test-ovsdb.py b/tests/test-ovsdb.py
index 86f0168..2ea2bd5 100644
--- a/tests/test-ovsdb.py
+++ b/tests/test-ovsdb.py
@@ -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',