From 18bfefece78f015669f8cbc83809b1cdfb60ada9 Mon Sep 17 00:00:00 2001 From: soergeld Date: Tue, 22 Dec 2020 11:51:24 +0100 Subject: [PATCH] revert changes to working version with external mock --- test/test_parentwork.py | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/test/test_parentwork.py b/test/test_parentwork.py index b3322bcac..e46ce2d74 100644 --- a/test/test_parentwork.py +++ b/test/test_parentwork.py @@ -20,8 +20,8 @@ from __future__ import division, absolute_import, print_function import os import unittest from test.helper import TestHelper -#from mock import Mock -#import musicbrainzngs +from mock import Mock +import musicbrainzngs from beets.library import Item from beetsplug import parentwork @@ -56,6 +56,16 @@ p_work = {'work': {'id': '3', 'sort-name': 'composer, random'}}]}} +def mock_workid_response(mbid, includes): + if mbid == '1': + return work + elif mbid == '2': + return dp_work + elif mbid == '3': + return p_work + + + class ParentWorkIntegrationTest(unittest.TestCase, TestHelper): def setUp(self): @@ -137,22 +147,22 @@ class ParentWorkTest(unittest.TestCase, TestHelper): """Set up configuration""" self.setup_beets() self.load_plugins('parentwork') - self.patcher1 = unittest.mock.patch('musicbrainzngs.get_work_by_id') - self.mock_workid_response = self.patcher1.start() - #musicbrainzngs.get_work_by_id = Mock(side_effect=mock_workid_response) + #self.patcher1 = unittest.mock.patch('musicbrainzngs.get_work_by_id') + #self.mock_workid_response = self.patcher1.start() + musicbrainzngs.get_work_by_id = Mock(side_effect=mock_workid_response) def tearDown(self): self.unload_plugins() self.teardown_beets() - self.patcher1.stop() + #self.patcher1.stop() - def mock_workid_response(self, mbid, includes): - if mbid == '1': - return work - elif mbid == '2': - return dp_work - elif mbid == '3': - return p_work + #def mock_workid_response(self, mbid, includes): + # if mbid == '1': + # return work + # elif mbid == '2': + # return dp_work + # elif mbid == '3': + # return p_work def test_normal_case(self): item = Item(path='/file', mb_workid='1', parentwork_workid_current='1')