Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-04 15:03:22 +01:00
Code Issues Projects Releases Wiki Activity

Use new assertion in config tests

Browse source
This commit is contained in:
Adrian Sampson 2016-06-06 11:40:04 -07:00
parent 8359b9e90f
commit a5b7489dd1
2 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
test/_common.py
View file

@ -123,9 +123,30 @@ def import_session(lib=None, loghandler=None, paths=[], query=[], cli=False):
return cls(lib, loghandler, paths, query)
class Assertions(object):
"""A mixin with additional unit test assertions."""
def assertExists(self, path): # noqa
self.assertTrue(os.path.exists(path),
u'file does not exist: {!r}'.format(path))
def assertNotExists(self, path): # noqa
self.assertFalse(os.path.exists(path),
u'file exists: {!r}'.format((path)))
def assert_equal_path(self, a, b):
"""Check that two paths are equal."""
# The common case.
if a == b:
return
self.assertEqual(util.normpath(a), util.normpath(b),
u'paths are not equal: {!r} and {!r}'.format(a, b))
# A test harness for all beets tests.
# Provides temporary, isolated configuration.
class TestCase(unittest.TestCase):
class TestCase(unittest.TestCase, Assertions):
"""A unittest.TestCase subclass that saves and restores beets'
global configuration. This allows tests to make temporary
modifications that will then be automatically removed when the test
@ -164,23 +185,6 @@ class TestCase(unittest.TestCase):
beets.config.clear()
beets.config._materialized = False
def assertExists(self, path): # noqa
self.assertTrue(os.path.exists(path),
u'file does not exist: {!r}'.format(path))
def assertNotExists(self, path): # noqa
self.assertFalse(os.path.exists(path),
u'file exists: {!r}'.format((path)))
def assert_equal_path(self, a, b):
"""Check that two paths are equal."""
# The common case.
if a == b:
return
self.assertEqual(util.normpath(a), util.normpath(b),
u'paths not equal: {!r} and {!r}'.format(a, b))
class LibTestCase(TestCase):
"""A test case that includes an in-memory library object (`lib`) and

26
test/test_ui.py
View file

@ -635,7 +635,7 @@ class InputTest(_common.TestCase):
@_common.slow_test()
class ConfigTest(unittest.TestCase, TestHelper):
class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions):
def setUp(self):
self.setup_beets()
@ -821,10 +821,14 @@ class ConfigTest(unittest.TestCase, TestHelper):
file.write('statefile: state')
ui._raw_main(['--config', cli_config_path, 'test'])
self.assertEqual(config['library'].as_filename(),
os.path.join(self.user_config_dir, 'beets.db'))
self.assertEqual(config['statefile'].as_filename(),
os.path.join(self.user_config_dir, 'state'))
self.assert_equal_path(
config['library'].as_filename(),
os.path.join(self.user_config_dir, 'beets.db')
)
self.assert_equal_path(
config['statefile'].as_filename(),
os.path.join(self.user_config_dir, 'state')
)
def test_cli_config_paths_resolve_relative_to_beetsdir(self):
os.environ['BEETSDIR'] = self.beetsdir
@ -835,16 +839,16 @@ class ConfigTest(unittest.TestCase, TestHelper):
file.write('statefile: state')
ui._raw_main(['--config', cli_config_path, 'test'])
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'))
def test_command_line_option_relative_to_working_dir(self):
os.chdir(self.temp_dir)
ui._raw_main(['--library', 'foo.db', 'test'])
self.assertEqual(config['library'].as_filename(),
os.path.join(os.getcwd(), 'foo.db'))
self.assert_equal_path(config['library'].as_filename(),
os.path.join(os.getcwd(), 'foo.db'))
def test_cli_config_file_loads_plugin_commands(self):
plugin_path = os.path.join(_common.RSRC, 'beetsplug')