add --refresh to scanner

tests/scanner.TestCase

@@ -4,7 +4,6 @@ import glob
 import inspect
 import logging
 import optparse
-import io
 import os
 import re
 import shutil
@@ -500,56 +499,56 @@ class Test_scan_binary(unittest.TestCase):
 class Test_SignatureDataController(unittest.TestCase):
     # __init__
     def test_init(self):
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         self.assertEqual(sdc.name, 'nnn')
         self.assertEqual(sdc.filename, 'fff.yml')
-        self.assertEqual(sdc.cache_outdated_interval, None)
+        self.assertEqual(sdc.cache_outdated_interval, timedelta(999999))
         self.assertDictEqual(sdc.data, {})
 
     # check_last_updated
     def test_check_last_updated_ok(self):
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         sdc.data['timestamp'] = datetime.now().astimezone().isoformat()
         sdc.check_last_updated()
 
     def test_check_last_updated_exception_cache_outdated(self):
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         sdc.cache_outdated_interval = timedelta(days=7)
         sdc.data['timestamp'] = (datetime.now().astimezone() - timedelta(days=30)).isoformat()
         with self.assertRaises(fdroidserver.scanner.SignatureDataOutdatedException):
             sdc.check_last_updated()
 
     def test_check_last_updated_exception_missing_timestamp_value(self):
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         with self.assertRaises(fdroidserver.scanner.SignatureDataMalformedException):
             sdc.check_last_updated()
 
     def test_check_last_updated_exception_not_string(self):
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         sdc.data['timestamp'] = 12345
         with self.assertRaises(fdroidserver.scanner.SignatureDataMalformedException):
             sdc.check_last_updated()
 
     def test_check_last_updated_exception_not_iso_formatted_string(self):
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         sdc.data['timestamp'] = '01/09/2002 10:11'
         with self.assertRaises(fdroidserver.scanner.SignatureDataMalformedException):
             sdc.check_last_updated()
 
     # check_data_version
     def test_check_data_version_ok(self):
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         sdc.data['version'] = fdroidserver.scanner.SCANNER_CACHE_VERSION
         sdc.check_data_version()
 
     def test_check_data_version_exception(self):
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         with self.assertRaises(fdroidserver.scanner.SignatureDataVersionMismatchException):
             sdc.check_data_version()
 
     def test_write_to_cache(self):
         open_func = mock.mock_open()
-        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml')
+        sdc = fdroidserver.scanner.SignatureDataController('nnn', 'fff.yml', 'https://example.com/test.json')
         sdc.data = {"mocked": "data"}
 
         with mock.patch("builtins.open", open_func), mock.patch(
@@ -565,28 +564,6 @@ class Test_SignatureDataController(unittest.TestCase):
         )
 
 
-class Test_SUSSDataController_fetch_signatures_from_web(unittest.TestCase):
-    def setUp(self):
-        self.uo_func = mock.Mock(return_value=io.StringIO(textwrap.dedent('''\
-          version: 999
-          timestamp: "1999-12-31T23:59:59.999999+00:00"
-          signatures:
-          - binary_signature: com/google/firebase
-            name: Google Firebase
-            types:
-            - tracker
-            - non-free
-          - gradle_signature: com/google/android/gms
-            name: Google Mobile Services
-            types:
-            - non-free
-          - network_signature: doubleclick\\.net
-            name: Another thing to test.
-            types:
-            - ads
-        ''')))
-
-
 class Test_main(unittest.TestCase):
     def setUp(self):
         self.args = ["com.example.app", "local/additional.apk", "another.apk"]
@@ -654,7 +631,6 @@ if __name__ == "__main__":
         unittest.makeSuite(ScannerTest),
         unittest.makeSuite(Test_scan_binary),
         unittest.makeSuite(Test_SignatureDataController),
-        unittest.makeSuite(Test_SUSSDataController_fetch_signatures_from_web),
         unittest.makeSuite(Test_main),
     ])
     unittest.main(failfast=False)