From 6c969ae58c9bdce293915b6419641d41bd40df24 Mon Sep 17 00:00:00 2001 From: Johnny Robeson Date: Sat, 11 Jun 2016 21:29:17 -0400 Subject: [PATCH] remove some incorrect displayable_path in library tests These were noticed by @sampsyo in the review of https://github.com/beetbox/beets/commit/daac41668eeb46e7be986d0053dc2942c88d5a4d --- test/test_library.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/test_library.py b/test/test_library.py index 291b782b9..3afe3c0dd 100644 --- a/test/test_library.py +++ b/test/test_library.py @@ -358,29 +358,29 @@ class DestinationTest(_common.TestCase): self.i.artist = u'' self.i.albumartist = u'something' self.lib.path_formats = [(u'default', u'$artist')] - p = util.displayable_path(self.i.destination()) - self.assertEqual(p.rsplit(util.PATH_SEP, 1)[1], u'something') + p = self.i.destination() + self.assertEqual(p.rsplit(util.PATH_SEP, 1)[1], b'something') def test_albumartist_falls_back_to_artist(self): self.i.artist = u'trackartist' self.i.albumartist = u'' self.lib.path_formats = [(u'default', u'$albumartist')] - p = util.displayable_path(self.i.destination()) - self.assertEqual(p.rsplit(util.PATH_SEP, 1)[1], u'trackartist') + p = self.i.destination() + self.assertEqual(p.rsplit(util.PATH_SEP, 1)[1], b'trackartist') def test_artist_overrides_albumartist(self): self.i.artist = u'theartist' self.i.albumartist = u'something' self.lib.path_formats = [(u'default', u'$artist')] - p = util.displayable_path(self.i.destination()) - self.assertEqual(p.rsplit(util.PATH_SEP, 1)[1], u'theartist') + p = self.i.destination() + self.assertEqual(p.rsplit(util.PATH_SEP, 1)[1], b'theartist') def test_albumartist_overrides_artist(self): self.i.artist = u'theartist' self.i.albumartist = u'something' self.lib.path_formats = [(u'default', u'$albumartist')] - p = util.displayable_path(self.i.destination()) - self.assertEqual(p.rsplit(util.PATH_SEP, 1)[1], u'something') + p = self.i.destination() + self.assertEqual(p.rsplit(util.PATH_SEP, 1)[1], b'something') def test_unicode_normalized_nfd_on_mac(self): instr = unicodedata.normalize('NFC', u'caf\xe9')