From e624aa121c91471c3045500dbd15434f03b3be3f Mon Sep 17 00:00:00 2001 From: Wieland Hoffmann Date: Fri, 19 Oct 2018 17:51:01 +0200 Subject: [PATCH] Make PicardTestCase the parent class of all tests This brings the faketagger and, more importantly, settings reset to all of them. --- test/picardtestcase.py | 6 +++++- test/test_acoustid.py | 8 ++++++-- test/test_amazon_urls.py | 4 ++-- test/test_api_helpers.py | 7 ++++--- test/test_browser.py | 5 +++-- test/test_bytes2human.py | 5 +++-- test/test_compatid3.py | 4 ++-- test/test_coverart_utils.py | 5 +++-- test/test_filesystem.py | 5 ++--- test/test_formats.py | 12 +++++------- test/test_imagelist.py | 14 ++++++-------- test/test_mbjson.py | 4 ++-- test/test_metadata.py | 5 +++-- test/test_releaseversions.py | 5 +++-- test/test_script.py | 5 +++-- test/test_similarity.py | 4 ++-- test/test_textencoding.py | 15 +++++++-------- test/test_tracknum.py | 5 ++--- test/test_union_sorted_lists.py | 5 ++--- test/test_util_astrcmp.py | 6 +++--- test/test_util_filenaming.py | 3 ++- test/test_utils.py | 19 ++++++++++--------- test/test_versioncompare.py | 5 ++--- test/test_versions.py | 14 ++------------ test/test_webservice.py | 14 ++++++++------ 25 files changed, 92 insertions(+), 92 deletions(-) diff --git a/test/picardtestcase.py b/test/picardtestcase.py index 16ad2b7d4..c67cf9250 100644 --- a/test/picardtestcase.py +++ b/test/picardtestcase.py @@ -1,9 +1,13 @@ # -*- coding: utf-8 -*- import unittest -from picard import (config, log) from PyQt5 import QtCore +from picard import ( + config, + log, +) + class FakeTagger(QtCore.QObject): diff --git a/test/test_acoustid.py b/test/test_acoustid.py index 4e0a25433..75ae58c7c 100644 --- a/test/test_acoustid.py +++ b/test/test_acoustid.py @@ -1,6 +1,6 @@ import json import os -import unittest +from test.picardtestcase import PicardTestCase from picard import config from picard.acoustid.json_helpers import parse_recording @@ -17,7 +17,9 @@ settings = { } -class AcoustIDTest(unittest.TestCase): +class AcoustIDTest(PicardTestCase): + def setUp(self): + super(AcoustIDTest, self).setUp() def init_test(self, filename): config.setting = settings.copy() @@ -29,6 +31,7 @@ class AcoustIDTest(unittest.TestCase): class RecordingTest(AcoustIDTest): def setUp(self): + super(RecordingTest, self).setUp() self.init_test('acoustid.json') def test_recording(self): @@ -52,6 +55,7 @@ class RecordingTest(AcoustIDTest): class NullRecordingTest(AcoustIDTest): def setUp(self): + super(NullRecordingTest, self).setUp() self.init_test('acoustid_null.json') def test_recording(self): diff --git a/test/test_amazon_urls.py b/test/test_amazon_urls.py index 73b14df18..d3615e06f 100644 --- a/test/test_amazon_urls.py +++ b/test/test_amazon_urls.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- -import unittest +from test.picardtestcase import PicardTestCase from picard.util import parse_amazon_url -class ParseAmazonUrlTest(unittest.TestCase): +class ParseAmazonUrlTest(PicardTestCase): def test_1(self): url = 'http://www.amazon.com/dp/020530902X' diff --git a/test/test_api_helpers.py b/test/test_api_helpers.py index 646c6dde0..e309c601e 100644 --- a/test/test_api_helpers.py +++ b/test/test_api_helpers.py @@ -1,4 +1,4 @@ -import unittest +from test.picardtestcase import PicardTestCase from unittest.mock import MagicMock from picard import config @@ -9,9 +9,10 @@ from picard.webservice.api_helpers import ( ) -class APITest(unittest.TestCase): +class APITest(PicardTestCase): def setUp(self): + super().setUp() self.host = "abc.com" self.port = 80 self.api_path = "/v1/" @@ -43,7 +44,7 @@ class APITest(unittest.TestCase): self._test_ws_function_args(self.ws.delete) -class MBAPITest(unittest.TestCase): +class MBAPITest(PicardTestCase): def setUp(self): self.config = {'server_host': "mb.org", "server_port": 443} diff --git a/test/test_browser.py b/test/test_browser.py index 2dff968f5..f14781353 100644 --- a/test/test_browser.py +++ b/test/test_browser.py @@ -1,4 +1,4 @@ -import unittest +from test.picardtestcase import PicardTestCase from unittest.mock import patch from urllib.parse import ( parse_qs, @@ -13,9 +13,10 @@ PORT = 443 LOCAL_PORT = "8000" -class BrowserLookupTest(unittest.TestCase): +class BrowserLookupTest(PicardTestCase): def setUp(self): + super().setUp() self.lookup = FileLookup(None, SERVER, PORT, LOCAL_PORT) @patch.object(webbrowser2, 'open') diff --git a/test/test_bytes2human.py b/test/test_bytes2human.py index bf0e8ba71..7700a6377 100644 --- a/test/test_bytes2human.py +++ b/test/test_bytes2human.py @@ -2,14 +2,15 @@ import os.path import shutil import sys import tempfile -import unittest +from test.picardtestcase import PicardTestCase from picard.i18n import setup_gettext from picard.util import bytes2human -class Testbytes2human(unittest.TestCase): +class Testbytes2human(PicardTestCase): def setUp(self): + super().setUp() # we are using temporary locales for tests self.tmp_path = tempfile.mkdtemp() if sys.hexversion >= 0x020700F0: diff --git a/test/test_compatid3.py b/test/test_compatid3.py index 4862d269a..94ed87e24 100644 --- a/test/test_compatid3.py +++ b/test/test_compatid3.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import unittest +from test.picardtestcase import PicardTestCase from mutagen import id3 @@ -8,7 +8,7 @@ from picard.formats.id3 import id3text from picard.formats.mutagenext import compatid3 -class UpdateToV23Test(unittest.TestCase): +class UpdateToV23Test(PicardTestCase): def test_id3text(self): self.assertEqual(id3text(u"\u1234", 0), u"?") diff --git a/test/test_coverart_utils.py b/test/test_coverart_utils.py index 6c7ae3d61..0380ad9dd 100644 --- a/test/test_coverart_utils.py +++ b/test/test_coverart_utils.py @@ -3,14 +3,15 @@ import os.path import shutil import tempfile -import unittest +from test.picardtestcase import PicardTestCase from picard.coverart.utils import translate_caa_type from picard.i18n import setup_gettext -class CaaTypeTranslationTest(unittest.TestCase): +class CaaTypeTranslationTest(PicardTestCase): def setUp(self): + super().setUp() # we are using temporary locales for tests self.tmp_path = tempfile.mkdtemp() self.localedir = os.path.join(self.tmp_path, 'locale') diff --git a/test/test_filesystem.py b/test/test_filesystem.py index fe4cb0213..aaba6b797 100644 --- a/test/test_filesystem.py +++ b/test/test_filesystem.py @@ -3,11 +3,10 @@ from contextlib import suppress import os.path import shutil from tempfile import mkdtemp - +from test.picardtestcase import PicardTestCase from picard import config import picard.formats -from test.picardtestcase import PicardTestCase settings = { 'enabled_plugins': '', @@ -20,7 +19,7 @@ settings = { class TestFileSystem(PicardTestCase): def setUp(self): - super(TestFileSystem, self).setUp() + super().setUp() self.src_directory = mkdtemp() self.tgt_directory = mkdtemp() config.setting = settings.copy() diff --git a/test/test_formats.py b/test/test_formats.py index 1fbdec4cf..90c46849a 100644 --- a/test/test_formats.py +++ b/test/test_formats.py @@ -2,13 +2,12 @@ import os.path import shutil from tempfile import mkstemp +from test.picardtestcase import PicardTestCase import unittest from PyQt5 import QtCore -from picard import ( - config, -) +from picard import config from picard.coverart.image import ( CoverArtImage, TagCoverArtImage, @@ -16,7 +15,6 @@ from picard.coverart.image import ( import picard.formats from picard.formats import ext_to_format from picard.metadata import Metadata -from test.picardtestcase import PicardTestCase settings = { 'clear_existing_tags': False, @@ -140,7 +138,7 @@ class CommonTests: testfile_path = None def setUp(self): - super(CommonTests.FormatsTest, self).setUp() + super().setUp() self.tags = TAGS.copy() _name, self.testfile_ext = os.path.splitext(self.testfile) config.setting = settings.copy() @@ -556,7 +554,7 @@ cover_settings = { class TestCoverArt(PicardTestCase): def setUp(self): - super(TestCoverArt, self).setUp() + super().setUp() with open(os.path.join('test', 'data', 'mb.jpg'), 'rb') as f: self.jpegdata = f.read() with open(os.path.join('test', 'data', 'mb.png'), 'rb') as f: @@ -840,7 +838,7 @@ class WAVTest(PicardTestCase): filename = os.path.join('test', 'data', 'test.wav') def setUp(self): - super(WAVTest, self).setUp() + super().setUp() config.setting = settings.copy() def test_can_open_and_save(self): diff --git a/test/test_imagelist.py b/test/test_imagelist.py index f2a6ca276..6565c462c 100644 --- a/test/test_imagelist.py +++ b/test/test_imagelist.py @@ -1,23 +1,21 @@ # -*- coding: utf-8 -*- import struct +from test.picardtestcase import PicardTestCase import unittest from picard.album import Album from picard.cluster import Cluster from picard.coverart.image import CoverArtImage -from picard.track import Track from picard.file import File +from picard.track import Track from picard.util.imagelist import ( add_metadata_images, remove_metadata_images, - update_metadata_images + update_metadata_images, ) -from test.picardtestcase import PicardTestCase - - def create_fake_png(extra): """Creates fake PNG data that satisfies Picard's internal image type detection""" return b'\x89PNG\x0D\x0A\x1A\x0A' + (b'a' * 4) + b'IHDR' + struct.pack('>LL', 100, 100) + extra @@ -45,7 +43,7 @@ def create_test_files(): class UpdateMetadataImagesTest(PicardTestCase): def setUp(self): - super(UpdateMetadataImagesTest, self).setUp() + super().setUp() (self.test_images, self.test_files) = create_test_files() def test_update_cluster_images(self): @@ -124,7 +122,7 @@ class UpdateMetadataImagesTest(PicardTestCase): class RemoveMetadataImagesTest(PicardTestCase): def setUp(self): - super(RemoveMetadataImagesTest, self).setUp() + super().setUp() (self.test_images, self.test_files) = create_test_files() def test_remove_from_cluster(self): @@ -215,7 +213,7 @@ class RemoveMetadataImagesTest(PicardTestCase): class AddMetadataImagesTest(PicardTestCase): def setUp(self): - super(AddMetadataImagesTest, self).setUp() + super().setUp() (self.test_images, self.test_files) = create_test_files() def test_add_to_cluster(self): diff --git a/test/test_mbjson.py b/test/test_mbjson.py index 81343bebd..eeafaf849 100644 --- a/test/test_mbjson.py +++ b/test/test_mbjson.py @@ -1,5 +1,6 @@ import json import os +from test.picardtestcase import PicardTestCase from picard import config from picard.album import Album @@ -17,7 +18,6 @@ from picard.mbjson import ( from picard.metadata import Metadata from picard.releasegroup import ReleaseGroup from picard.track import Track -from test.picardtestcase import PicardTestCase settings = { "standardize_tracks": False, @@ -31,7 +31,7 @@ settings = { class MBJSONTest(PicardTestCase): def setUp(self): - super(MBJSONTest, self).setUp() + super().setUp() self.init_test(self.filename) def init_test(self, filename): diff --git a/test/test_metadata.py b/test/test_metadata.py index 65a47940f..ba45b0d5b 100644 --- a/test/test_metadata.py +++ b/test/test_metadata.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import unittest +from test.picardtestcase import PicardTestCase from picard import config from picard.metadata import ( @@ -13,12 +13,13 @@ settings = { } -class MetadataTest(unittest.TestCase): +class MetadataTest(PicardTestCase): original = None tags = [] def setUp(self): + super().setUp() config.setting = settings.copy() self.metadata = Metadata() self.metadata["single1"] = "single1-value" diff --git a/test/test_releaseversions.py b/test/test_releaseversions.py index 83970c929..b07cdfebc 100644 --- a/test/test_releaseversions.py +++ b/test/test_releaseversions.py @@ -3,7 +3,7 @@ import os.path import shutil import sys import tempfile -import unittest +from test.picardtestcase import PicardTestCase from picard import config from picard.i18n import setup_gettext @@ -17,7 +17,7 @@ settings = { } -class ReleaseTest(unittest.TestCase): +class ReleaseTest(PicardTestCase): @staticmethod def load_data(filename): @@ -25,6 +25,7 @@ class ReleaseTest(unittest.TestCase): return json.load(f) def setUp(self): + super().setUp() # we are using temporary locales for tests self.tmp_path = tempfile.mkdtemp() if sys.hexversion >= 0x020700F0: diff --git a/test/test_script.py b/test/test_script.py index 00e07c543..b5c36747f 100644 --- a/test/test_script.py +++ b/test/test_script.py @@ -1,4 +1,4 @@ -import unittest +from test.picardtestcase import PicardTestCase from picard import config from picard.metadata import Metadata @@ -11,9 +11,10 @@ from picard.script import ( from picard.ui.options.renaming import _DEFAULT_FILE_NAMING_FORMAT -class ScriptParserTest(unittest.TestCase): +class ScriptParserTest(PicardTestCase): def setUp(self): + super().setUp() config.setting = { 'enabled_plugins': '', } diff --git a/test/test_similarity.py b/test/test_similarity.py index 92eab61d0..33f7d5213 100644 --- a/test/test_similarity.py +++ b/test/test_similarity.py @@ -1,9 +1,9 @@ -import unittest +from test.picardtestcase import PicardTestCase from picard.similarity import similarity -class SimilarityTest(unittest.TestCase): +class SimilarityTest(PicardTestCase): def test_correct(self): self.assertEqual(similarity(u"K!", u"K!"), 1.0) diff --git a/test/test_textencoding.py b/test/test_textencoding.py index 7d511e9ad..7caa89039 100644 --- a/test/test_textencoding.py +++ b/test/test_textencoding.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -import unittest +from test.picardtestcase import PicardTestCase from picard import util @@ -106,7 +105,7 @@ combinations_to = ( ascii_chars = u" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" -class CompatibilityTest(unittest.TestCase): +class CompatibilityTest(PicardTestCase): def test_correct(self): self.maxDiff = None @@ -119,7 +118,7 @@ class CompatibilityTest(unittest.TestCase): pass -class PunctuationTest(unittest.TestCase): +class PunctuationTest(PicardTestCase): def test_correct(self): self.maxDiff = None @@ -136,7 +135,7 @@ class PunctuationTest(unittest.TestCase): pass -class CombinationsTest(unittest.TestCase): +class CombinationsTest(PicardTestCase): def test_correct(self): self.maxDiff = None @@ -153,7 +152,7 @@ class CombinationsTest(unittest.TestCase): pass -class AsciiPunctTest(unittest.TestCase): +class AsciiPunctTest(PicardTestCase): def test_correct(self): self.assertEqual(util.textencoding.asciipunct(u"‘Test’"), u"'Test'") # Quotations @@ -165,7 +164,7 @@ class AsciiPunctTest(unittest.TestCase): pass -class UnaccentTest(unittest.TestCase): +class UnaccentTest(PicardTestCase): def test_correct(self): self.assertEqual(util.textencoding.unaccent(u"Lukáš"), u"Lukas") @@ -180,7 +179,7 @@ class UnaccentTest(unittest.TestCase): self.assertNotEqual(util.textencoding.unaccent(u"ænima"), u"aenima") -class ReplaceNonAsciiTest(unittest.TestCase): +class ReplaceNonAsciiTest(PicardTestCase): def test_correct(self): self.assertEqual(util.textencoding.replace_non_ascii(u"Lukáš"), u"Lukas") diff --git a/test/test_tracknum.py b/test/test_tracknum.py index c4d6393ff..c7cdcbe9a 100644 --- a/test/test_tracknum.py +++ b/test/test_tracknum.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -import unittest +from test.picardtestcase import PicardTestCase from picard.util import tracknum_from_filename @@ -9,7 +8,7 @@ def parse(filename): return tracknum_from_filename(filename) -class TracknumTest(unittest.TestCase): +class TracknumTest(PicardTestCase): def test_matched_tracknum_01(self): self.assertEqual(parse('1.mp3'), 1) diff --git a/test/test_union_sorted_lists.py b/test/test_union_sorted_lists.py index 33c32f87e..bfb65b64c 100644 --- a/test/test_union_sorted_lists.py +++ b/test/test_union_sorted_lists.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- - -import unittest +from test.picardtestcase import PicardTestCase from picard.util import union_sorted_lists -class UnionSortedListsTest(unittest.TestCase): +class UnionSortedListsTest(PicardTestCase): def test_1(self): list1 = [1, 2, 3] diff --git a/test/test_util_astrcmp.py b/test/test_util_astrcmp.py index 3a957ceac..8488c1099 100644 --- a/test/test_util_astrcmp.py +++ b/test/test_util_astrcmp.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- - +from test.picardtestcase import PicardTestCase import unittest from picard.util.astrcmp import astrcmp_py @@ -24,7 +24,7 @@ class AstrcmpBase(object): self.assertAlmostEqual(0.7083333333333333, astrcmp(u"The Great Gig in the Sky", u"Great Gig In The sky")) -class AstrcmpCTest(AstrcmpBase, unittest.TestCase): +class AstrcmpCTest(AstrcmpBase, PicardTestCase): func = astrcmp_c @unittest.skipIf(astrcmp_c is None, "The _astrcmp C extension module has not been compiled") @@ -32,5 +32,5 @@ class AstrcmpCTest(AstrcmpBase, unittest.TestCase): super().test_astrcmp() -class AstrcmpPyTest(AstrcmpBase, unittest.TestCase): +class AstrcmpPyTest(AstrcmpBase, PicardTestCase): func = astrcmp_py diff --git a/test/test_util_filenaming.py b/test/test_util_filenaming.py index de59b6a87..28fe4ebaf 100644 --- a/test/test_util_filenaming.py +++ b/test/test_util_filenaming.py @@ -3,12 +3,13 @@ import os import os.path import sys +from test.picardtestcase import PicardTestCase import unittest from picard.util.filenaming import make_short_filename -class ShortFilenameTest(unittest.TestCase): +class ShortFilenameTest(PicardTestCase): def __init__(self, *args, **kwargs): self.maxDiff = None diff --git a/test/test_utils.py b/test/test_utils.py index a9761a880..853f94d0b 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -3,6 +3,7 @@ import builtins import os.path import sys +from test.picardtestcase import PicardTestCase import unittest from picard import util @@ -13,7 +14,7 @@ if '_' not in builtins.__dict__: builtins.__dict__['_'] = lambda a: a -class ReplaceWin32IncompatTest(unittest.TestCase): +class ReplaceWin32IncompatTest(PicardTestCase): @unittest.skipUnless(sys.platform == "win32", "windows test") def test_correct_absolute_win32(self): @@ -40,7 +41,7 @@ class ReplaceWin32IncompatTest(unittest.TestCase): "c:\\test\\te\"st2") -class SanitizeDateTest(unittest.TestCase): +class SanitizeDateTest(PicardTestCase): def test_correct(self): self.assertEqual(util.sanitize_date("2006--"), "2006") @@ -55,7 +56,7 @@ class SanitizeDateTest(unittest.TestCase): self.assertNotEqual(util.sanitize_date("2006.03.02"), "2006-03-02") -class TranslateArtistTest(unittest.TestCase): +class TranslateArtistTest(PicardTestCase): def test_latin(self): self.assertEqual(u"Jean Michel Jarre", util.translate_from_sortname(u"Jean Michel Jarre", u"Jarre, Jean Michel")) @@ -77,7 +78,7 @@ class TranslateArtistTest(unittest.TestCase): self.assertNotEqual(u"Пётр Ильич Чайковский", util.translate_from_sortname(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich")) -class FormatTimeTest(unittest.TestCase): +class FormatTimeTest(PicardTestCase): def test(self): self.assertEqual("?:??", util.format_time(0)) @@ -86,7 +87,7 @@ class FormatTimeTest(unittest.TestCase): self.assertEqual("2:59", util.format_time(179499)) -class HiddenFileTest(unittest.TestCase): +class HiddenFileTest(PicardTestCase): @unittest.skipUnless(sys.platform != "win32", "non-windows test") def test(self): @@ -95,7 +96,7 @@ class HiddenFileTest(unittest.TestCase): self.assertFalse(util.is_hidden('/a/.b/c.mp3')) -class TagsTest(unittest.TestCase): +class TagsTest(PicardTestCase): def test_display_tag_name(self): dtn = util.tags.display_tag_name @@ -109,7 +110,7 @@ class TagsTest(unittest.TestCase): self.assertEqual(dtn(''), '') -class LinearCombinationTest(unittest.TestCase): +class LinearCombinationTest(PicardTestCase): def test_0(self): parts = [] @@ -152,7 +153,7 @@ class LinearCombinationTest(unittest.TestCase): self.assertRaises(TypeError, util.linear_combination_of_weights, parts) -class AlbumArtistFromPathTest(unittest.TestCase): +class AlbumArtistFromPathTest(PicardTestCase): def test_album_artist_from_path(self): aafp = util.album_artist_from_path @@ -178,7 +179,7 @@ class AlbumArtistFromPathTest(unittest.TestCase): self.assertEqual(aafp(file_4, 'album', 'artist'), ('album', 'artist')) -class ImageInfoTest(unittest.TestCase): +class ImageInfoTest(PicardTestCase): def test_gif(self): file = os.path.join('test', 'data', 'mb.gif') diff --git a/test/test_versioncompare.py b/test/test_versioncompare.py index 6f7d53f99..f87a6a9ca 100644 --- a/test/test_versioncompare.py +++ b/test/test_versioncompare.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- - -import unittest +from test.picardtestcase import PicardTestCase from picard.util import compare_version_tuples -class CompareVersionsTest(unittest.TestCase): +class CompareVersionsTest(PicardTestCase): '''Unit tests for compare_version_tuples() function.''' def test_compare_version_01(self): diff --git a/test/test_versions.py b/test/test_versions.py index 217c61e18..bd3a467d3 100644 --- a/test/test_versions.py +++ b/test/test_versions.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- - -import sys -import unittest +from test.picardtestcase import PicardTestCase from picard import ( VersionError, @@ -9,16 +7,8 @@ from picard import ( version_to_string, ) -# assertLess is available since 2.7 only -if sys.version_info[:2] == (2, 6): - def assertLess(self, a, b, msg=None): - if not a < b: - self.fail('%s not less than %s' % (repr(a), repr(b))) - unittest.TestCase.assertLess = assertLess - - -class VersionsTest(unittest.TestCase): +class VersionsTest(PicardTestCase): def test_version_conv_1(self): l, s = (0, 0, 1, 'dev', 1), '0.0.1.dev1' diff --git a/test/test_webservice.py b/test/test_webservice.py index cae63ba49..26ae49297 100644 --- a/test/test_webservice.py +++ b/test/test_webservice.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -import unittest +from test.picardtestcase import PicardTestCase from unittest.mock import ( MagicMock, patch, @@ -23,9 +22,10 @@ PROXY_SETTINGS = { } -class WebServiceTest(unittest.TestCase): +class WebServiceTest(PicardTestCase): def setUp(self): + super().setUp() config.setting = {'use_proxy': False, 'server_host': ''} self.ws = WebService() @@ -60,9 +60,10 @@ class WebServiceTest(unittest.TestCase): self.assertEqual(5, mock_add_task.call_count) -class WebServiceTaskTest(unittest.TestCase): +class WebServiceTaskTest(PicardTestCase): def setUp(self): + super().setUp() config.setting = {'use_proxy': False} self.ws = WebService() @@ -174,9 +175,10 @@ class WebServiceTaskTest(unittest.TestCase): self.assertNotIn(key, self.ws._queues[0]) -class WebServiceProxyTest(unittest.TestCase): +class WebServiceProxyTest(PicardTestCase): def setUp(self): + super().setUp() config.setting = PROXY_SETTINGS.copy() self.ws = WebService() self.proxy = self.ws.manager.proxy() @@ -193,7 +195,7 @@ class WebServiceProxyTest(unittest.TestCase): self.assertEqual(self.proxy.port(), PROXY_SETTINGS['proxy_server_port']) -class ParserHookTest(unittest.TestCase): +class ParserHookTest(PicardTestCase): def test_parser_hook(self): WebService.add_parser('A', 'mime', 'parser')