metadata.TestCase: metadata.warnings_action = 'error' as default

The default state for the tests should be to fail on errors.
This commit is contained in:
Hans-Christoph Steiner 2023-04-24 23:18:33 +02:00
parent 822439dff5
commit 0b3fd725c3

View file

@ -9,7 +9,6 @@ import random
import shutil import shutil
import sys import sys
import unittest import unittest
from unittest import mock
import tempfile import tempfile
import textwrap import textwrap
from collections import OrderedDict from collections import OrderedDict
@ -39,6 +38,7 @@ class MetadataTest(unittest.TestCase):
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
self.basedir = localmodule / 'tests' self.basedir = localmodule / 'tests'
os.chdir(self.basedir) os.chdir(self.basedir)
fdroidserver.metadata.warnings_action = 'error'
def tearDown(self): def tearDown(self):
# auto-generated dirs by functions, not tests, so they are not always cleaned up # auto-generated dirs by functions, not tests, so they are not always cleaned up
@ -67,8 +67,6 @@ class MetadataTest(unittest.TestCase):
break break
self.assertIsNotNone(validator, "could not find 'Bitcoin address' validator") self.assertIsNotNone(validator, "could not find 'Bitcoin address' validator")
fdroidserver.metadata.warnings_action = 'error'
# some valid addresses (P2PKH, P2SH, Bech32) # some valid addresses (P2PKH, P2SH, Bech32)
self.assertIsNone( self.assertIsNone(
validator.check('1BrrrrErsrWetrTrnrrrrm4GFg7xJaNVN2', 'fake.app.id') validator.check('1BrrrrErsrWetrTrnrrrrm4GFg7xJaNVN2', 'fake.app.id')
@ -126,8 +124,6 @@ class MetadataTest(unittest.TestCase):
break break
self.assertIsNotNone(validator, "could not find 'Litecoin address' validator") self.assertIsNotNone(validator, "could not find 'Litecoin address' validator")
fdroidserver.metadata.warnings_action = 'error'
# some valid addresses (L, M, 3, segwit) # some valid addresses (L, M, 3, segwit)
self.assertIsNone( self.assertIsNone(
validator.check('LgeGrrrrJAxyXprrPrrBrrX5Qrrrrrrrrd', 'fake.app.id') validator.check('LgeGrrrrJAxyXprrPrrBrrX5Qrrrrrrrrd', 'fake.app.id')
@ -326,7 +322,6 @@ class MetadataTest(unittest.TestCase):
self.assertEqual('true', metadata._normalize_type_string(True)) self.assertEqual('true', metadata._normalize_type_string(True))
def test_post_parse_yaml_metadata(self): def test_post_parse_yaml_metadata(self):
fdroidserver.metadata.warnings_action = 'error'
yamldata = OrderedDict() yamldata = OrderedDict()
builds = [] builds = []
yamldata['Builds'] = builds yamldata['Builds'] = builds
@ -425,7 +420,6 @@ class MetadataTest(unittest.TestCase):
) )
) )
mf.name = 'mock_filename.yaml' mf.name = 'mock_filename.yaml'
with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
with self.assertRaises(MetaDataException): with self.assertRaises(MetaDataException):
fdroidserver.metadata.parse_yaml_metadata(mf) fdroidserver.metadata.parse_yaml_metadata(mf)
@ -440,7 +434,6 @@ class MetadataTest(unittest.TestCase):
) )
) )
mf.name = 'mock_filename.yaml' mf.name = 'mock_filename.yaml'
with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
with self.assertRaises(MetaDataException): with self.assertRaises(MetaDataException):
fdroidserver.metadata.parse_yaml_metadata(mf) fdroidserver.metadata.parse_yaml_metadata(mf)
@ -474,7 +467,6 @@ class MetadataTest(unittest.TestCase):
""" """
) )
) )
with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
with self.assertRaises(MetaDataException): with self.assertRaises(MetaDataException):
fdroidserver.metadata.parse_yaml_srclib(srclibfile) fdroidserver.metadata.parse_yaml_srclib(srclibfile)
@ -555,7 +547,6 @@ class MetadataTest(unittest.TestCase):
) )
mf.name = 'mock_filename.yaml' mf.name = 'mock_filename.yaml'
mf.seek(0) mf.seek(0)
with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
result = fdroidserver.metadata.parse_yaml_metadata(mf) result = fdroidserver.metadata.parse_yaml_metadata(mf)
self.maxDiff = None self.maxDiff = None
self.assertDictEqual( self.assertDictEqual(
@ -610,7 +601,6 @@ class MetadataTest(unittest.TestCase):
) )
mf.name = 'mock_filename.yaml' mf.name = 'mock_filename.yaml'
mf.seek(0) mf.seek(0)
with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
result = fdroidserver.metadata.parse_yaml_metadata(mf) result = fdroidserver.metadata.parse_yaml_metadata(mf)
self.maxDiff = None self.maxDiff = None
self.assertDictEqual( self.assertDictEqual(
@ -660,7 +650,6 @@ class MetadataTest(unittest.TestCase):
) )
mf.name = 'mock_filename.yaml' mf.name = 'mock_filename.yaml'
mf.seek(0) mf.seek(0)
with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
result = fdroidserver.metadata.parse_yaml_metadata(mf) result = fdroidserver.metadata.parse_yaml_metadata(mf)
self.assertDictEqual( self.assertDictEqual(
result, result,
@ -694,7 +683,6 @@ class MetadataTest(unittest.TestCase):
) )
mf.name = 'mock_filename.yaml' mf.name = 'mock_filename.yaml'
mf.seek(0) mf.seek(0)
with mock.patch('fdroidserver.metadata.warnings_action', 'error'):
result = fdroidserver.metadata.parse_yaml_metadata(mf) result = fdroidserver.metadata.parse_yaml_metadata(mf)
self.assertNotIn('Provides', result) self.assertNotIn('Provides', result)
self.assertNotIn('provides', result) self.assertNotIn('provides', result)
@ -923,7 +911,6 @@ class MetadataTest(unittest.TestCase):
) )
def test_parse_yaml_srclib_unknown_key(self): def test_parse_yaml_srclib_unknown_key(self):
fdroidserver.metadata.warnings_action = 'error'
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir): with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
with Path('test.yml').open('w', encoding='utf-8') as f: with Path('test.yml').open('w', encoding='utf-8') as f:
f.write( f.write(
@ -942,7 +929,6 @@ class MetadataTest(unittest.TestCase):
fdroidserver.metadata.parse_yaml_srclib(Path('test.yml')) fdroidserver.metadata.parse_yaml_srclib(Path('test.yml'))
def test_parse_yaml_srclib_does_not_exists(self): def test_parse_yaml_srclib_does_not_exists(self):
fdroidserver.metadata.warnings_action = 'error'
with self.assertRaisesRegex( with self.assertRaisesRegex(
MetaDataException, MetaDataException,
"Invalid scrlib metadata: " "Invalid scrlib metadata: "
@ -954,7 +940,6 @@ class MetadataTest(unittest.TestCase):
) )
def test_parse_yaml_srclib_simple(self): def test_parse_yaml_srclib_simple(self):
fdroidserver.metadata.warnings_action = 'error'
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir): with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
with Path('simple.yml').open('w', encoding='utf-8') as f: with Path('simple.yml').open('w', encoding='utf-8') as f:
f.write( f.write(
@ -978,7 +963,6 @@ class MetadataTest(unittest.TestCase):
) )
def test_parse_yaml_srclib_simple_with_blanks(self): def test_parse_yaml_srclib_simple_with_blanks(self):
fdroidserver.metadata.warnings_action = 'error'
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir): with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
with Path('simple.yml').open('w', encoding='utf-8') as f: with Path('simple.yml').open('w', encoding='utf-8') as f:
f.write( f.write(
@ -1008,7 +992,6 @@ class MetadataTest(unittest.TestCase):
) )
def test_parse_yaml_srclib_Changelog_cketti(self): def test_parse_yaml_srclib_Changelog_cketti(self):
fdroidserver.metadata.warnings_action = 'error'
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir): with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
with Path('Changelog-cketti.yml').open('w', encoding='utf-8') as f: with Path('Changelog-cketti.yml').open('w', encoding='utf-8') as f:
f.write( f.write(
@ -1040,7 +1023,6 @@ class MetadataTest(unittest.TestCase):
) )
def test_read_srclibs_yml_subdir_list(self): def test_read_srclibs_yml_subdir_list(self):
fdroidserver.metadata.warnings_action = 'error'
fdroidserver.metadata.srclibs = None fdroidserver.metadata.srclibs = None
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir): with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
Path('srclibs').mkdir() Path('srclibs').mkdir()
@ -1092,7 +1074,6 @@ class MetadataTest(unittest.TestCase):
) )
def test_read_srclibs_yml_prepare_list(self): def test_read_srclibs_yml_prepare_list(self):
fdroidserver.metadata.warnings_action = 'error'
fdroidserver.metadata.srclibs = None fdroidserver.metadata.srclibs = None
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir): with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
Path('srclibs').mkdir() Path('srclibs').mkdir()
@ -1133,7 +1114,6 @@ class MetadataTest(unittest.TestCase):
) )
def test_read_srclibs(self): def test_read_srclibs(self):
fdroidserver.metadata.warnings_action = 'error'
fdroidserver.metadata.srclibs = None fdroidserver.metadata.srclibs = None
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir): with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
Path('srclibs').mkdir() Path('srclibs').mkdir()