fff3014e15
More details about the fix to the testDuration failure (regression):
```
FAIL: testDuration (whipper.test.test_image_toc.CapitalMergeTestCase)
testDuration
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/travis/virtualenv/python3.5.6/lib/python3.5/site-packages/twisted/internet/defer.py", line 151, in maybeDeferred
result = f(*args, **kw)
File "/home/travis/virtualenv/python3.5.6/lib/python3.5/site-packages/twisted/internet/utils.py", line 221, in runWithWarningsSuppressed
reraise(exc_info[1], exc_info[2])
File "/home/travis/virtualenv/python3.5.6/lib/python3.5/site-packages/twisted/python/compat.py", line 464, in reraise
raise exception.with_traceback(traceback)
File "/home/travis/virtualenv/python3.5.6/lib/python3.5/site-packages/twisted/internet/utils.py", line 217, in runWithWarningsSuppressed
result = f(*a, **kw)
File "/home/travis/build/whipper-team/whipper/whipper/test/test_image_toc.py", line 271, in testDuration
self.assertEqual(self.table.getFrameLength(), 173530)
File "/home/travis/virtualenv/python3.5.6/lib/python3.5/site-packages/twisted/trial/_synctest.py", line 432, in assertEqual
super(_Assertions, self).assertEqual(first, second, msg)
File "/opt/python/3.5.6/lib/python3.5/unittest/case.py", line 829, in assertEqual
assertion_func(first, second, msg=msg)
File "/opt/python/3.5.6/lib/python3.5/unittest/case.py", line 822, in _baseAssertEqual
raise self.failureException(msg)
twisted.trial.unittest.FailTest: 184930 != 173530
```
The test fails because if either nextTrack.session or thisTrack.session are None the if is false and the instructions inside it aren't executed. The check for None is needed because Python 3 doesn't allow NoneType comparisons (in Python 2 that was possible).
IIRC correctly in that test nextTrack.session has value 2 while thisTrack.session is None. That means the Python 2 version evaluates the if condition to true, while the Python 3 version in the first commit does not.
With this change both of the values of nextTrack.session and thisTrack.session are compared as int (if None, the value 1 is used for the comparison - as in disc session 1).
Regression introduced in 64dd9d843a.
Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
31 lines
1.1 KiB
Python
31 lines
1.1 KiB
Python
# vi:si:et:sw=4:sts=4:ts=4:set fileencoding=utf-8
|
|
"""Tests for whipper.command.mblookup"""
|
|
|
|
import os
|
|
import pickle
|
|
import unittest
|
|
|
|
from whipper.command import mblookup
|
|
|
|
|
|
class MBLookupTestCase(unittest.TestCase):
|
|
"""Test cases for whipper.command.mblookup.MBLookup"""
|
|
|
|
@staticmethod
|
|
def _mock_musicbrainz(discid, country=None, record=False):
|
|
"""Mock function for whipper.common.mbngs.musicbrainz function."""
|
|
filename = "whipper.discid.{}.pickle".format(discid)
|
|
path = os.path.join(os.path.dirname(__file__), filename)
|
|
with open(path, "rb") as p:
|
|
return pickle.load(p)
|
|
|
|
def testMissingReleaseType(self):
|
|
"""Test that lookup for release without a type set doesn't fail."""
|
|
# Using: Gustafsson, Österberg & Cowle - What's Up? 8 (disc 4)
|
|
# https://musicbrainz.org/release/d8e6153a-2c47-4804-9d73-0aac1081c3b1
|
|
mblookup.musicbrainz = self._mock_musicbrainz
|
|
discid = "xu338_M8WukSRi0J.KTlDoflB8Y-"
|
|
# https://musicbrainz.org/cdtoc/xu338_M8WukSRi0J.KTlDoflB8Y-
|
|
lookup = mblookup.MBLookup([discid], 'whipper mblookup', None)
|
|
lookup.do()
|