summaryrefslogtreecommitdiffstats
path: root/test/test_library.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/test_library.py')
-rw-r--r--test/test_library.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/test_library.py b/test/test_library.py
index c9d0440b5..82cc0092b 100644
--- a/test/test_library.py
+++ b/test/test_library.py
@@ -33,7 +33,7 @@ from beets import config, plugins, util
from beets.test import _common
from beets.test._common import item
from beets.test.helper import TestHelper
-from beets.util import bytestring_path, syspath
+from beets.util import as_string, bytestring_path, syspath
# Shortcut to path normalization.
np = util.normpath
@@ -419,14 +419,14 @@ class DestinationTest(_common.TestCase):
def test_unicode_normalized_nfd_on_mac(self):
instr = unicodedata.normalize("NFC", "caf\xe9")
self.lib.path_formats = [("default", instr)]
- dest = self.i.destination(platform="darwin", fragment=True)
- self.assertEqual(dest, unicodedata.normalize("NFD", instr))
+ dest = self.i.destination(platform="darwin", relative_to_libdir=True)
+ self.assertEqual(as_string(dest), unicodedata.normalize("NFD", instr))
def test_unicode_normalized_nfc_on_linux(self):
instr = unicodedata.normalize("NFD", "caf\xe9")
self.lib.path_formats = [("default", instr)]
- dest = self.i.destination(platform="linux", fragment=True)
- self.assertEqual(dest, unicodedata.normalize("NFC", instr))
+ dest = self.i.destination(platform="linux", relative_to_libdir=True)
+ self.assertEqual(as_string(dest), unicodedata.normalize("NFC", instr))
def test_non_mbcs_characters_on_windows(self):
oldfunc = sys.getfilesystemencoding
@@ -444,8 +444,8 @@ class DestinationTest(_common.TestCase):
def test_unicode_extension_in_fragment(self):
self.lib.path_formats = [("default", "foo")]
self.i.path = util.bytestring_path("bar.caf\xe9")
- dest = self.i.destination(platform="linux", fragment=True)
- self.assertEqual(dest, "foo.caf\xe9")
+ dest = self.i.destination(platform="linux", relative_to_libdir=True)
+ self.assertEqual(as_string(dest), "foo.caf\xe9")
def test_asciify_and_replace(self):
config["asciify_paths"] = True