diff --git a/test/_common.py b/test/_common.py index a3388b88e..d467a75aa 100644 --- a/test/_common.py +++ b/test/_common.py @@ -162,9 +162,10 @@ class TestCase(unittest.TestCase, Assertions): # Direct paths to a temporary directory. Tests can also use this # temporary directory. self.temp_dir = tempfile.mkdtemp() - beets.config['statefile'] = os.path.join(self.temp_dir, 'state.pickle') - beets.config['library'] = os.path.join(self.temp_dir, 'library.db') - beets.config['directory'] = os.path.join(self.temp_dir, 'libdir') + beets.config['statefile'] = os.path.join(self.temp_dir, + b'state.pickle') + beets.config['library'] = os.path.join(self.temp_dir, b'library.db') + beets.config['directory'] = os.path.join(self.temp_dir, b'libdir') # Set $HOME, which is used by confit's `config_dir()` to create # directories. diff --git a/test/helper.py b/test/helper.py index d0b8472b4..24171920f 100644 --- a/test/helper.py +++ b/test/helper.py @@ -185,7 +185,7 @@ class TestHelper(object): self.config['directory'] = self.libdir if disk: - dbpath = self.config['library'].as_filename() + dbpath = util.bytestring_path(self.config['library'].as_filename()) else: dbpath = ':memory:' self.lib = Library(dbpath, self.libdir) diff --git a/test/test_art.py b/test/test_art.py index a36719ac5..5c3a4d7e9 100644 --- a/test/test_art.py +++ b/test/test_art.py @@ -415,7 +415,7 @@ class ArtImporterTest(UseThePlugin): self.plugin.art_for_album = art_for_album # Test library. - self.libpath = os.path.join(self.temp_dir, 'tmplib.blb') + self.libpath = os.path.join(self.temp_dir, b'tmplib.blb') self.libdir = os.path.join(self.temp_dir, b'tmplib') os.mkdir(self.libdir) os.mkdir(os.path.join(self.libdir, b'album')) diff --git a/test/test_ui.py b/test/test_ui.py index 63af553bf..7177f4ce3 100644 --- a/test/test_ui.py +++ b/test/test_ui.py @@ -671,11 +671,11 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions): # Default user configuration if platform.system() == 'Windows': self.user_config_dir = os.path.join( - self.temp_dir, 'AppData', 'Roaming', 'beets' + self.temp_dir, b'AppData', b'Roaming', b'beets' ) else: self.user_config_dir = os.path.join( - self.temp_dir, '.config', 'beets' + self.temp_dir, b'.config', b'beets' ) os.makedirs(self.user_config_dir) self.user_config_path = os.path.join(self.user_config_dir, @@ -846,11 +846,11 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions): ui._raw_main(['--config', cli_config_path, 'test']) self.assert_equal_path( config['library'].as_filename(), - os.path.join(self.user_config_dir, 'beets.db') + os.path.join(self.user_config_dir, b'beets.db') ) self.assert_equal_path( config['statefile'].as_filename(), - os.path.join(self.user_config_dir, 'state') + os.path.join(self.user_config_dir, b'state') ) def test_cli_config_paths_resolve_relative_to_beetsdir(self): @@ -863,9 +863,9 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions): ui._raw_main(['--config', cli_config_path, 'test']) self.assert_equal_path(config['library'].as_filename(), - os.path.join(self.beetsdir, 'beets.db')) + os.path.join(self.beetsdir, b'beets.db')) self.assert_equal_path(config['statefile'].as_filename(), - os.path.join(self.beetsdir, 'state')) + os.path.join(self.beetsdir, b'state')) def test_command_line_option_relative_to_working_dir(self): os.chdir(self.temp_dir) @@ -885,7 +885,7 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions): def test_beetsdir_config(self): os.environ['BEETSDIR'] = self.beetsdir - env_config_path = os.path.join(self.beetsdir, 'config.yaml') + env_config_path = os.path.join(self.beetsdir, b'config.yaml') with open(env_config_path, 'w') as file: file.write('anoption: overwrite') @@ -893,7 +893,7 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions): self.assertEqual(config['anoption'].get(), 'overwrite') def test_beetsdir_points_to_file_error(self): - beetsdir = os.path.join(self.temp_dir, 'beetsfile') + beetsdir = os.path.join(self.temp_dir, b'beetsfile') open(beetsdir, 'a').close() os.environ['BEETSDIR'] = beetsdir self.assertRaises(ConfigError, ui._raw_main, ['test']) @@ -911,24 +911,24 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions): os.environ['BEETSDIR'] = self.beetsdir config.read() - self.assertEqual(config['library'].as_filename(), - os.path.join(self.beetsdir, 'library.db')) - self.assertEqual(config['statefile'].as_filename(), - os.path.join(self.beetsdir, 'state.pickle')) + self.assert_equal_path(config['library'].as_filename(), + os.path.join(self.beetsdir, b'library.db')) + self.assert_equal_path(config['statefile'].as_filename(), + os.path.join(self.beetsdir, b'state.pickle')) def test_beetsdir_config_paths_resolve_relative_to_beetsdir(self): os.environ['BEETSDIR'] = self.beetsdir - env_config_path = os.path.join(self.beetsdir, 'config.yaml') + env_config_path = os.path.join(self.beetsdir, b'config.yaml') with open(env_config_path, 'w') as file: file.write('library: beets.db\n') file.write('statefile: state') config.read() - self.assertEqual(config['library'].as_filename(), - os.path.join(self.beetsdir, 'beets.db')) - self.assertEqual(config['statefile'].as_filename(), - os.path.join(self.beetsdir, 'state')) + self.assert_equal_path(config['library'].as_filename(), + os.path.join(self.beetsdir, 'beets.db')) + self.assert_equal_path(config['statefile'].as_filename(), + os.path.join(self.beetsdir, 'state')) class ShowModelChangeTest(_common.TestCase):