diff options
| author | John Beck <john.beck@oracle.com> | 2014-10-06 18:26:27 +0800 |
|---|---|---|
| committer | Daniel Veillard <veillard@redhat.com> | 2014-10-06 18:26:27 +0800 |
| commit | 6bea543eca4804832ca044c73ec62d2dc9594ccb (patch) | |
| tree | d644869c93eda9cbcd59cece47e0fddbebfc5168 | |
| parent | 24fb4c329a9b8e142e9d388901a1c59a07f94ed5 (diff) | |
| download | libxml2-6bea543eca4804832ca044c73ec62d2dc9594ccb.tar.gz | |
python/tests/sync.py assumes Python dictionaries are ordered
For https://bugzilla.gnome.org/show_bug.cgi?id=734017
Solaris has had libxml2 version 2.9.1 for a while, with Python versions 2.6 and
2.7. While preparing to also build a module for Python 3.4, we ran into an
issue with the test case sync.py failing. The failure involved parsing a
string that included a Python dictionary, then complaining when the order of
the parsed result did not match the original order. But Python dictionaries
are unordered by definition; see section 5.5 of
https://docs.python.org/2/tutorial/datastructures.html . For whatever reason,
Python 2.6 and 2.7 always happened to report the pair of values back in their
original order, but with Python 3.4 the order is random. The attached patch
allows for either order; it also fixes a typo that was repeated several times
thanks to the magic of copy & paste.
| -rwxr-xr-x | python/tests/sync.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/python/tests/sync.py b/python/tests/sync.py index 9d565db6..5a8609e9 100755 --- a/python/tests/sync.py +++ b/python/tests/sync.py @@ -51,7 +51,7 @@ ctxt=None reference = "startDocument:startElement foo None:startElement bar2 None:endElement bar2:" if log != reference: print("Error got: %s" % log) - print("Exprected: %s" % reference) + print("Expected: %s" % reference) sys.exit(1) log="" @@ -63,7 +63,7 @@ ctxt=None reference = "startDocument:startElement foo None:startElement bar2 None:endElement bar2:" if log != reference: print("Error got: %s" % log) - print("Exprected: %s" % reference) + print("Expected: %s" % reference) sys.exit(1) log="" @@ -75,7 +75,7 @@ ctxt=None reference = "startDocument:startElement foo None:startElement bar2 None:" if log != reference: print("Error got: %s" % log) - print("Exprected: %s" % reference) + print("Expected: %s" % reference) sys.exit(1) log="" @@ -84,10 +84,11 @@ ctxt = libxml2.createPushParser(handler, None, 0, "test.xml") ctxt.parseChunk(chunk, len(chunk), 0) ctxt=None -reference = "startDocument:startElement foo None:startElement bar2 {'a': '1', 'b': '2'}:endElement bar2:" -if log != reference: +reference1 = "startDocument:startElement foo None:startElement bar2 {'a': '1', 'b': '2'}:endElement bar2:" +reference2 = "startDocument:startElement foo None:startElement bar2 {'b': '2', 'a': '1'}:endElement bar2:" +if log not in (reference1, reference2): print("Error got: %s" % log) - print("Exprected: %s" % reference) + print("Expected: %s" % reference) sys.exit(1) log="" @@ -96,10 +97,11 @@ ctxt = libxml2.createPushParser(handler, None, 0, "test.xml") ctxt.parseChunk(chunk, len(chunk), 0) ctxt=None -reference = "startDocument:startElement foo None:startElement bar2 {'a': '1', 'b': '2'}:" -if log != reference: +reference1 = "startDocument:startElement foo None:startElement bar2 {'a': '1', 'b': '2'}:" +reference2 = "startDocument:startElement foo None:startElement bar2 {'b': '2', 'a': '1'}:" +if log not in (reference1, reference2): print("Error got: %s" % log) - print("Exprected: %s" % reference) + print("Expected: %s" % reference) sys.exit(1) log="" @@ -108,10 +110,11 @@ ctxt = libxml2.createPushParser(handler, None, 0, "test.xml") ctxt.parseChunk(chunk, len(chunk), 0) ctxt=None -reference = "startDocument:startElement foo None:startElement bar2 {'a': '1', 'b': '2'}:endElement bar2:" -if log != reference: +reference1 = "startDocument:startElement foo None:startElement bar2 {'a': '1', 'b': '2'}:endElement bar2:" +reference2 = "startDocument:startElement foo None:startElement bar2 {'b': '2', 'a': '1'}:endElement bar2:" +if log not in (reference1, reference2): print("Error got: %s" % log) - print("Exprected: %s" % reference) + print("Expected: %s" % reference) sys.exit(1) log="" @@ -123,7 +126,7 @@ ctxt=None reference = "startDocument:startElement foo None:" if log != reference: print("Error got: %s" % log) - print("Exprected: %s" % reference) + print("Expected: %s" % reference) sys.exit(1) # Memory debug specific |