mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-scanner-tests-failing-with-refresh' into 'master'

Browse source 
scanner: always use built-in ruleset when running tests

See merge request fdroid/fdroidserver!1532
This commit is contained in:
Hans-Christoph Steiner 2024-09-23 07:57:57 +00:00
commit 96ec2da0e7
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/scanner.py
View file

@ -354,6 +354,8 @@ class SUSSDataController(SignatureDataController):
class ScannerTool: class ScannerTool:
refresh_allowed = True
def __init__(self): def __init__(self):
# we could add support for loading additional signature source # we could add support for loading additional signature source
# definitions from config.yml here # definitions from config.yml here
@ -362,7 +364,9 @@ class ScannerTool:
options = common.get_options() options = common.get_options()
options_refresh_scanner = ( options_refresh_scanner = (
hasattr(options, "refresh_scanner") and options.refresh_scanner hasattr(options, "refresh_scanner")
and options.refresh_scanner
and ScannerTool.refresh_allowed
) )
if options_refresh_scanner or common.get_config().get('refresh_scanner'): if options_refresh_scanner or common.get_config().get('refresh_scanner'):
self.refresh() self.refresh()

7
tests/scanner.TestCase
View file

@ -33,6 +33,11 @@ import fdroidserver.scanner
from testcommon import TmpCwd, mkdtemp, mock_open_to_str, parse_args_for_test from testcommon import TmpCwd, mkdtemp, mock_open_to_str, parse_args_for_test
# Always use built-in default rules so changes in downloaded rules don't break tests.
@mock.patch(
'fdroidserver.scanner.SUSSDataController.load',
fdroidserver.scanner.SUSSDataController.load_from_defaults,
)
class ScannerTest(unittest.TestCase): class ScannerTest(unittest.TestCase):
def setUp(self): def setUp(self):
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
@ -40,6 +45,7 @@ class ScannerTest(unittest.TestCase):
os.chdir(self.basedir) os.chdir(self.basedir)
self._td = mkdtemp() self._td = mkdtemp()
self.testdir = self._td.name self.testdir = self._td.name
fdroidserver.scanner.ScannerTool.refresh_allowed = False
def tearDown(self): def tearDown(self):
os.chdir(self.basedir) os.chdir(self.basedir)
@ -712,6 +718,7 @@ class Test_ScannerTool(unittest.TestCase):
os.chdir(self.basedir) os.chdir(self.basedir)
self._td = mkdtemp() self._td = mkdtemp()
self.testdir = self._td.name self.testdir = self._td.name
fdroidserver.scanner.ScannerTool.refresh_allowed = True
def tearDown(self): def tearDown(self):
fdroidserver.common.options = None fdroidserver.common.options = None