Attachment 78339 Details for Bug 63810 – messages/invalid-utf8.py: amend test-case to work under GLib 2.36

[patch] messages/invalid-utf8.py: amend test-case to work under GLib 2.36

0002-messages-invalid-utf8.py-amend-test-case-to-work-und.patch (text/plain), 3.08 KB, created by Simon McVittie on 2013-04-22 17:50:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-04-22 17:50:21 UTC

Size: 3.08 KB

patch

obsolete

>From e524fa65b8d57263b15c0ffec060135a328796da Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 22 Apr 2013 18:18:30 +0100
>Subject: [PATCH 2/3] messages/invalid-utf8.py: amend test-case to work under
> GLib 2.36
>
>---
> tests/twisted/messages/invalid-utf8.py |   29 ++++++++++++++++++++---------
> 1 file changed, 20 insertions(+), 9 deletions(-)
>
>diff --git a/tests/twisted/messages/invalid-utf8.py b/tests/twisted/messages/invalid-utf8.py
>index 9f3d057..a48c2f4 100644
>--- a/tests/twisted/messages/invalid-utf8.py
>+++ b/tests/twisted/messages/invalid-utf8.py
>@@ -1,27 +1,31 @@
> # coding=utf-8
> """
>-Test that incoming messages containing well-formed but invalid UTF-8 code
>-points don't make Idle fall off the bus. This is a regression test for
>-<https://bugs.freedesktop.org/show_bug.cgi?id=30741>.
>+Test that incoming messages containing invalid UTF-8
>+don't make Idle fall off the bus. This is a regression test for
>+bugs similar to <https://bugs.freedesktop.org/show_bug.cgi?id=30741>.
> """
> 
> from idletest import exec_test
> from servicetest import assertEquals
>+import re
> 
> def test(q, bus, conn, stream):
>     conn.Connect()
>     q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
> 
>     test_with_message(q, stream, ["I'm no ", " Buddhist"])
>-    # Check that valid exotic characters don't get lost
>-    test_with_message(q, stream, [u"bjÃ¶rk"] * 5)
>+    test_with_message(q, stream, [u"bjÃ¶rk"] * 3)
> 
>     test_with_message(q, stream, ["", "lolllllll"])
>     test_with_message(q, stream, ["hello", ""])
>     test_with_message(q, stream, "I am a stabbing robot".split(" "))
> 
>-# This is the UTF-8 encoding of U+FDD2, which is not a valid Unicode character.
>-WELL_FORMED_BUT_INVALID_UTF8_BYTES = "\xef\xb7\x92"
>+# This is the UTF-8 encoding of U+D800, which is not valid
>+# (not even as a noncharacter). We previously did this test with
>+# noncharacters, but Unicode Corrigendum #9 explicitly allows noncharacters
>+# to be interchanged, GLib 2.36 allows them when validating UTF-8,
>+# and D-Bus 1.6.10 will do likewise.
>+WELL_FORMED_BUT_INVALID_UTF8_BYTES = "\xed\xa0\x80"
> 
> def test_with_message(q, stream, parts):
>     invalid_utf8 = WELL_FORMED_BUT_INVALID_UTF8_BYTES.join(
>@@ -42,10 +46,17 @@ def test_with_message(q, stream, parts):
> 
>     # Don't make any assumption about how many U+FFFD REPLACEMENT CHARACTERs
>     # are used to replace surprising bytes.
>-    received_parts = [ part for part in content.split(u"\ufffd")
>+    received_parts = [ part for part in re.split(u"\ufffd|\\?", content)
>                        if part != u''
>                      ]
>-    assertEquals(filter(lambda s: s != u'', parts), received_parts)
>+
>+    if parts[0] == u'bjÃ¶rk':
>+        # The valid UTF-8 gets lost in transit, because we fall back
>+        # to assuming ASCII when g_convert() fails (this didn't happen
>+        # when we tested with noncharacters - oh well).
>+        assertEquals(['bj', 'rk', 'bj', 'rk', 'bj', 'rk'], received_parts)
>+    else:
>+        assertEquals(filter(lambda s: s != u'', parts), received_parts)
> 
> if __name__ == '__main__':
>     exec_test(test)
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 63810: 78338 | 78339 | 78341

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.