Replace deprecated unittest method names with the correct ones

This commit is contained in:
JoeLametta
2018-05-02 08:05:00 +00:00
parent 44ece38740
commit 5f75d41c7b
17 changed files with 248 additions and 248 deletions

View File

@@ -17,18 +17,18 @@ class CureTestCase(common.TestCase):
self.path = os.path.join(os.path.dirname(__file__), u'cure.toc')
self.toc = toc.TocFile(self.path)
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 13)
self.assertEqual(len(self.toc.table.tracks), 13)
def testGetTrackLength(self):
t = self.toc.table.tracks[0]
# first track has known length because the .toc is a single file
# its length is all of track 1 from .toc, plus the INDEX 00 length
# of track 2
self.assertEquals(self.toc.getTrackLength(t),
self.assertEqual(self.toc.getTrackLength(t),
(((6 * 60) + 16) * 75 + 45) + ((1 * 75) + 4))
# last track has unknown length
t = self.toc.table.tracks[-1]
self.assertEquals(self.toc.getTrackLength(t), -1)
self.assertEqual(self.toc.getTrackLength(t), -1)
def testIndexes(self):
# track 2, index 0 is at 06:16:45 or 28245
@@ -36,8 +36,8 @@ class CureTestCase(common.TestCase):
# FIXME: cdrdao seems to get length of FILE 1 frame too many,
# and START value one frame less
t = self.toc.table.tracks[1]
self.assertEquals(t.getIndex(0).relative, 28245)
self.assertEquals(t.getIndex(1).relative, 28324)
self.assertEqual(t.getIndex(0).relative, 28245)
self.assertEqual(t.getIndex(1).relative, 28324)
def _getIndex(self, t, i):
track = self.toc.table.tracks[t - 1]
@@ -45,15 +45,15 @@ class CureTestCase(common.TestCase):
def _assertAbsolute(self, t, i, value):
index = self._getIndex(t, i)
self.assertEquals(index.absolute, value)
self.assertEqual(index.absolute, value)
def _assertPath(self, t, i, value):
index = self._getIndex(t, i)
self.assertEquals(index.path, value)
self.assertEqual(index.path, value)
def _assertRelative(self, t, i, value):
index = self._getIndex(t, i)
self.assertEquals(index.relative, value)
self.assertEqual(index.relative, value)
def testSetFile(self):
self._assertAbsolute(1, 1, 0)
@@ -89,16 +89,16 @@ class CureTestCase(common.TestCase):
common.diffStrings(ref, cue)
# we verify it because it has failed in readdisc in the past
self.assertEquals(self.toc.table.accuraterip_path(),
self.assertEqual(self.toc.table.accuraterip_path(),
'3/c/4/dBAR-013-0019d4c3-00fe8924-b90c650d.bin')
def testGetRealPath(self):
self.assertRaises(KeyError, self.toc.getRealPath, u'track01.wav')
(fd, path) = tempfile.mkstemp(suffix=u'.whipper.test.wav')
self.assertEquals(self.toc.getRealPath(path), path)
self.assertEqual(self.toc.getRealPath(path), path)
winpath = path.replace('/', '\\')
self.assertEquals(self.toc.getRealPath(winpath), path)
self.assertEqual(self.toc.getRealPath(winpath), path)
os.close(fd)
os.unlink(path)
@@ -111,46 +111,46 @@ class BlocTestCase(common.TestCase):
self.path = os.path.join(os.path.dirname(__file__), u'bloc.toc')
self.toc = toc.TocFile(self.path)
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 13)
self.assertEqual(len(self.toc.table.tracks), 13)
def testGetTrackLength(self):
t = self.toc.table.tracks[0]
# first track has known length because the .toc is a single file
# the length is from Track 1, Index 1 to Track 2, Index 1, so
# does not include the htoa
self.assertEquals(self.toc.getTrackLength(t), 19649)
self.assertEqual(self.toc.getTrackLength(t), 19649)
# last track has unknown length
t = self.toc.table.tracks[-1]
self.assertEquals(self.toc.getTrackLength(t), -1)
self.assertEqual(self.toc.getTrackLength(t), -1)
def testIndexes(self):
track01 = self.toc.table.tracks[0]
index00 = track01.getIndex(0)
self.assertEquals(index00.absolute, 0)
self.assertEquals(index00.relative, 0)
self.assertEquals(index00.counter, 0)
self.assertEqual(index00.absolute, 0)
self.assertEqual(index00.relative, 0)
self.assertEqual(index00.counter, 0)
index01 = track01.getIndex(1)
self.assertEquals(index01.absolute, 15220)
self.assertEquals(index01.relative, 0)
self.assertEquals(index01.counter, 1)
self.assertEqual(index01.absolute, 15220)
self.assertEqual(index01.relative, 0)
self.assertEqual(index01.counter, 1)
track05 = self.toc.table.tracks[4]
index00 = track05.getIndex(0)
self.assertEquals(index00.absolute, 84070)
self.assertEquals(index00.relative, 68850)
self.assertEquals(index00.counter, 1)
self.assertEqual(index00.absolute, 84070)
self.assertEqual(index00.relative, 68850)
self.assertEqual(index00.counter, 1)
index01 = track05.getIndex(1)
self.assertEquals(index01.absolute, 84142)
self.assertEquals(index01.relative, 68922)
self.assertEquals(index01.counter, 1)
self.assertEqual(index01.absolute, 84142)
self.assertEqual(index01.relative, 68922)
self.assertEqual(index01.counter, 1)
# This disc has a pre-gap, so is a good test for .CUE writing
def testConvertCue(self):
self.failUnless(self.toc.table.hasTOC())
self.assertTrue(self.toc.table.hasTOC())
cue = self.toc.table.cue()
ref = self.readCue('bloc.cue')
common.diffStrings(ref, cue)
@@ -160,11 +160,11 @@ class BlocTestCase(common.TestCase):
# ad0be00d 13 15370 35019 51532 69190 84292 96826 112527 132448
# 148595 168072 185539 203331 222103 3244
self.assertEquals(self.toc.table.getCDDBDiscId(), 'ad0be00d')
self.assertEqual(self.toc.table.getCDDBDiscId(), 'ad0be00d')
def testAccurateRip(self):
# we verify it because it has failed in readdisc in the past
self.assertEquals(self.toc.table.accuraterip_path(),
self.assertEqual(self.toc.table.accuraterip_path(),
'e/d/2/dBAR-013-001af2de-0105994e-ad0be00d.bin')
# The Breeders - Mountain Battles has CDText
@@ -176,23 +176,23 @@ class BreedersTestCase(common.TestCase):
self.path = os.path.join(os.path.dirname(__file__), u'breeders.toc')
self.toc = toc.TocFile(self.path)
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 13)
self.assertEqual(len(self.toc.table.tracks), 13)
def testCDText(self):
cdt = self.toc.table.cdtext
self.assertEquals(cdt['PERFORMER'], 'THE BREEDERS')
self.assertEquals(cdt['TITLE'], 'MOUNTAIN BATTLES')
self.assertEqual(cdt['PERFORMER'], 'THE BREEDERS')
self.assertEqual(cdt['TITLE'], 'MOUNTAIN BATTLES')
t = self.toc.table.tracks[0]
cdt = t.cdtext
self.assertRaises(AttributeError, getattr, cdt, 'PERFORMER')
self.assertEquals(cdt['TITLE'], 'OVERGLAZED')
self.assertEqual(cdt['TITLE'], 'OVERGLAZED')
def testConvertCue(self):
self.failUnless(self.toc.table.hasTOC())
self.assertTrue(self.toc.table.hasTOC())
cue = self.toc.table.cue()
ref = self.readCue('breeders.cue')
self.assertEquals(cue, ref)
self.assertEqual(cue, ref)
# Ladyhawke has a data track
@@ -203,34 +203,34 @@ class LadyhawkeTestCase(common.TestCase):
self.path = os.path.join(os.path.dirname(__file__), u'ladyhawke.toc')
self.toc = toc.TocFile(self.path)
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 13)
self.failIf(self.toc.table.tracks[-1].audio)
self.assertEqual(len(self.toc.table.tracks), 13)
self.assertFalse(self.toc.table.tracks[-1].audio)
def testCDDBId(self):
self.assertEquals(self.toc.table.getCDDBDiscId(), 'c60af50d')
self.assertEqual(self.toc.table.getCDDBDiscId(), 'c60af50d')
# output from cd-discid:
# c60af50d 13 150 15687 31841 51016 66616 81352 99559 116070 133243
# 149997 161710 177832 207256 2807
def testMusicBrainz(self):
self.assertEquals(self.toc.table.getMusicBrainzDiscId(),
self.assertEqual(self.toc.table.getMusicBrainzDiscId(),
"KnpGsLhvH.lPrNc1PBL21lb9Bg4-")
self.assertEquals(self.toc.table.getMusicBrainzSubmitURL(),
self.assertEqual(self.toc.table.getMusicBrainzSubmitURL(),
"https://musicbrainz.org/cdtoc/attach?toc=1+12+195856+150+15687+31841+51016+66616+81352+99559+116070+133243+149997+161710+177832&tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4-") # noqa: E501
# FIXME: I don't trust this toc, but I can't find the CD anymore
def testDuration(self):
self.assertEquals(self.toc.table.duration(), 2761413)
self.assertEqual(self.toc.table.duration(), 2761413)
def testGetFrameLength(self):
self.assertEquals(self.toc.table.getFrameLength(data=True), 210385)
self.assertEqual(self.toc.table.getFrameLength(data=True), 210385)
def testCue(self):
self.failUnless(self.toc.table.canCue())
self.assertTrue(self.toc.table.canCue())
data = self.toc.table.cue()
lines = data.split("\n")
self.assertEquals(lines[0], "REM DISCID C60AF50D")
self.assertEqual(lines[0], "REM DISCID C60AF50D")
class CapitalMergeTestCase(common.TestCase):
@@ -239,20 +239,20 @@ class CapitalMergeTestCase(common.TestCase):
self.toc1 = toc.TocFile(os.path.join(os.path.dirname(__file__),
u'capital.1.toc'))
self.toc1.parse()
self.assertEquals(len(self.toc1.table.tracks), 11)
self.failUnless(self.toc1.table.tracks[-1].audio)
self.assertEqual(len(self.toc1.table.tracks), 11)
self.assertTrue(self.toc1.table.tracks[-1].audio)
self.toc2 = toc.TocFile(os.path.join(os.path.dirname(__file__),
u'capital.2.toc'))
self.toc2.parse()
self.assertEquals(len(self.toc2.table.tracks), 1)
self.failIf(self.toc2.table.tracks[-1].audio)
self.assertEqual(len(self.toc2.table.tracks), 1)
self.assertFalse(self.toc2.table.tracks[-1].audio)
self.table = copy.deepcopy(self.toc1.table)
self.table.merge(self.toc2.table)
def testCDDBId(self):
self.assertEquals(self.table.getCDDBDiscId(), 'b910140c')
self.assertEqual(self.table.getCDDBDiscId(), 'b910140c')
# output from cd-discid:
# b910140c 12 24320 44855 64090 77885 88095 104020 118245 129255 141765
# 164487 181780 209250 4440
@@ -261,15 +261,15 @@ class CapitalMergeTestCase(common.TestCase):
# URL to submit: https://musicbrainz.org/cdtoc/attach?toc=1+11+
# 197850+24320+44855+64090+77885+88095+104020+118245+129255+141765+
# 164487+181780&tracks=11&id=MAj3xXf6QMy7G.BIFOyHyq4MySE-
self.assertEquals(self.table.getMusicBrainzDiscId(),
self.assertEqual(self.table.getMusicBrainzDiscId(),
"MAj3xXf6QMy7G.BIFOyHyq4MySE-")
def testDuration(self):
# this matches track 11 end sector - track 1 start sector on
# MusicBrainz
# compare to 3rd and 4th value in URL above
self.assertEquals(self.table.getFrameLength(), 173530)
self.assertEquals(self.table.duration(), 2313733)
self.assertEqual(self.table.getFrameLength(), 173530)
self.assertEqual(self.table.duration(), 2313733)
class UnicodeTestCase(common.TestCase, common.UnicodeTestMixin):
@@ -286,7 +286,7 @@ class UnicodeTestCase(common.TestCase, common.UnicodeTestMixin):
shutil.copy(source, self.dest)
self.toc = toc.TocFile(self.dest)
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 10)
self.assertEqual(len(self.toc.table.tracks), 10)
def tearDown(self):
os.unlink(self.dest)
@@ -294,14 +294,14 @@ class UnicodeTestCase(common.TestCase, common.UnicodeTestMixin):
def testGetTrackLength(self):
t = self.toc.table.tracks[0]
# first track has known length because the .toc is a single file
self.assertEquals(self.toc.getTrackLength(t), 12001)
self.assertEqual(self.toc.getTrackLength(t), 12001)
# last track has unknown length
t = self.toc.table.tracks[-1]
self.assertEquals(self.toc.getTrackLength(t), -1)
self.assertEqual(self.toc.getTrackLength(t), -1)
def testGetTrackPerformer(self):
t = self.toc.table.tracks[0]
self.assertEquals(t.cdtext['PERFORMER'], self._performer)
self.assertEqual(t.cdtext['PERFORMER'], self._performer)
# Interpol - Turn of the Bright Lights has same cddb disc id as
@@ -314,10 +314,10 @@ class TOTBLTestCase(common.TestCase):
self.path = os.path.join(os.path.dirname(__file__), u'totbl.fast.toc')
self.toc = toc.TocFile(self.path)
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 11)
self.assertEqual(len(self.toc.table.tracks), 11)
def testCDDBId(self):
self.assertEquals(self.toc.table.getCDDBDiscId(), '810b7b0b')
self.assertEqual(self.toc.table.getCDDBDiscId(), '810b7b0b')
# The Strokes - Someday has a 1 frame SILENCE marked as such in toc
@@ -330,21 +330,21 @@ class StrokesTestCase(common.TestCase):
u'strokes-someday.toc')
self.toc = toc.TocFile(self.path)
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 1)
self.assertEqual(len(self.toc.table.tracks), 1)
def testIndexes(self):
t = self.toc.table.tracks[0]
i0 = t.getIndex(0)
self.assertEquals(i0.relative, 0)
self.assertEquals(i0.absolute, 0)
self.assertEquals(i0.counter, 0)
self.assertEquals(i0.path, None)
self.assertEqual(i0.relative, 0)
self.assertEqual(i0.absolute, 0)
self.assertEqual(i0.counter, 0)
self.assertEqual(i0.path, None)
i1 = t.getIndex(1)
self.assertEquals(i1.relative, 0)
self.assertEquals(i1.absolute, 1)
self.assertEquals(i1.counter, 1)
self.assertEquals(i1.path, u'data.wav')
self.assertEqual(i1.relative, 0)
self.assertEqual(i1.absolute, 1)
self.assertEqual(i1.counter, 1)
self.assertEqual(i1.path, u'data.wav')
cue = self._filterCue(self.toc.table.cue())
ref = self._filterCue(
@@ -388,32 +388,32 @@ class SurferRosaTestCase(common.TestCase):
self.path = os.path.join(os.path.dirname(__file__), u'surferrosa.toc')
self.toc = toc.TocFile(self.path)
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 21)
self.assertEqual(len(self.toc.table.tracks), 21)
def testIndexes(self):
# HTOA
t = self.toc.table.tracks[0]
self.assertEquals(len(t.indexes), 2)
self.assertEqual(len(t.indexes), 2)
i0 = t.getIndex(0)
self.assertEquals(i0.relative, 0)
self.assertEquals(i0.absolute, 0)
self.assertEquals(i0.path, None)
self.assertEquals(i0.counter, 0)
self.assertEqual(i0.relative, 0)
self.assertEqual(i0.absolute, 0)
self.assertEqual(i0.path, None)
self.assertEqual(i0.counter, 0)
i1 = t.getIndex(1)
self.assertEquals(i1.relative, 0)
self.assertEquals(i1.absolute, 32)
self.assertEquals(i1.path, 'data.wav')
self.assertEquals(i1.counter, 1)
self.assertEqual(i1.relative, 0)
self.assertEqual(i1.absolute, 32)
self.assertEqual(i1.path, 'data.wav')
self.assertEqual(i1.counter, 1)
# track 11, Vamos
t = self.toc.table.tracks[10]
self.assertEquals(len(t.indexes), 2)
self.assertEqual(len(t.indexes), 2)
# 32 frames of silence, and 1483 seconds of data.wav
self.assertEquals(t.getIndex(1).relative, 111225)
self.assertEquals(t.getIndex(1).absolute, 111257)
self.assertEquals(t.getIndex(2).relative, 111225 + 3370)
self.assertEquals(t.getIndex(2).absolute, 111257 + 3370)
self.assertEqual(t.getIndex(1).relative, 111225)
self.assertEqual(t.getIndex(1).absolute, 111257)
self.assertEqual(t.getIndex(2).relative, 111225 + 3370)
self.assertEqual(t.getIndex(2).absolute, 111257 + 3370)