From d9efb9bf452ec12eda18ff70062bdb95c52c3b61 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 30 Sep 2020 11:11:33 -0400 Subject: [PATCH 1/2] news fragment --- newsfragments/3454.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3454.minor diff --git a/newsfragments/3454.minor b/newsfragments/3454.minor new file mode 100644 index 000000000..e69de29bb From 751bc1452140d73f0b328a6690af3c3236b8e142 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 30 Sep 2020 11:11:44 -0400 Subject: [PATCH 2/2] Always make the todo message a native string. If the todo message isn't a native string, trial ignores it completely. Awesome. --- src/allmydata/test/test_python3.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/allmydata/test/test_python3.py b/src/allmydata/test/test_python3.py index 7a6d0b282..80242f8a2 100644 --- a/src/allmydata/test/test_python3.py +++ b/src/allmydata/test/test_python3.py @@ -8,7 +8,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from future.utils import PY2 +from future.utils import PY2, native_str if PY2: from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401 @@ -44,10 +44,9 @@ class Python3PortingEffortTests(SynchronousTestCase): ), ), ) - if PY2: - test_finished_porting.skip = "For some reason todo isn't working on Python 2 now" - else: - test_finished_porting.todo = "https://tahoe-lafs.org/trac/tahoe-lafs/milestone/Support%20Python%203 should be completed" + test_finished_porting.todo = native_str( + "https://tahoe-lafs.org/trac/tahoe-lafs/milestone/Support%20Python%203 should be completed", + ) def test_ported_modules_exist(self): """