Swap to using unicode strings in tests.

Author: AlexanderWells-diamond

softioc/device.py

@@ -284,7 +284,8 @@ def truncate_string(value):
             value = value.decode(errors="replace")
         return value[:39] if isinstance(value, str) else None
     else:
-        # Python2 strings are equivalent to Python3 bytestrings
+        if isinstance(value, bytes):
+            value = value.decode("utf-8", errors="replace")
         return value[:39] if isinstance(value, str) else None
 
 longin = _Device_In('longin', value_to_epics=convert_to_int)

tests/test_records.py

@@ -61,12 +61,12 @@ def idfn(fixture_value):
         (builder.stringIn, "", "", str),
         (builder.stringOut, b"abc", "abc", str),
         (builder.stringIn, b"abc", "abc", str),
-        (builder.stringOut, b"a\xcfb", "a�b", str),  # Invalid UTF-8
-        (builder.stringIn, b"a\xcfb", "a�b", str),  # Invalid UTF-8
-        (builder.stringOut, b"a\xe2\x82\xacb", "a€b", str),  # Valid UTF-8
-        (builder.stringIn, b"a\xe2\x82\xacb", "a€b", str),  # Valid UTF-8
-        (builder.stringOut, "a€b", "a€b", str),  # Valid UTF-8
-        (builder.stringIn, "a€b", "a€b", str),  # Valid UTF-8
+        (builder.stringOut, b"a\xcfb", u"a�b", str),  # Invalid UTF-8
+        (builder.stringIn, b"a\xcfb", u"a�b", str),  # Invalid UTF-8
+        (builder.stringOut, b"a\xe2\x82\xacb", u"a€b", str),  # Valid UTF-8
+        (builder.stringIn, b"a\xe2\x82\xacb", u"a€b", str),  # Valid UTF-8
+        (builder.stringOut, u"a€b", u"a€b", str),  # Valid UTF-8
+        (builder.stringIn, u"a€b", u"a€b", str),  # Valid UTF-8
         (
             builder.stringOut,
             "this string is much longer than 40 characters",
@@ -157,10 +157,6 @@ def record_value_asserts(
             "Arrays not equal: {} {}".format(actual_value, expected_value)
         assert type(actual_value) == expected_type
     else:
-        # Python2 handles UTF-8 differently so needs extra encoding
-        if sys.version_info < (3,) and expected_type == str:
-            expected_value = expected_value.decode("utf-8", errors="replace")
-
         assert actual_value == expected_value
         assert type(actual_value) == expected_type