diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index 96b6a1e2..9aa16bb7 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -1290,7 +1290,7 @@ def main(): ) continue - logging.info("...scanning versionCode " + build.versionCode) + logging.info(f"...scanning versionCode {build.versionCode}") # Prepare the source code... common.prepare_source( vcs, app, build, build_dir, srclib_dir, extlib_dir, False diff --git a/tests/test_scanner.py b/tests/test_scanner.py index 00595bb1..96f477ac 100755 --- a/tests/test_scanner.py +++ b/tests/test_scanner.py @@ -81,6 +81,31 @@ class ScannerTest(SetUpTearDownMixin, unittest.TestCase): super().setUp() fdroidserver.scanner.ScannerTool.refresh_allowed = False + def test_looping_through_builds(self): + """Exercises some of main() to get some coverage.""" + appid = "com.example" + with ( + tempfile.TemporaryDirectory() as tmpdir, + TmpCwd(tmpdir), + mock.patch("sys.argv", ["fdroid scanner", appid]), + mock.patch( + "fdroidserver.common.prepare_source", lambda v, a, b, d, s, e, r: None + ), + ): + os.mkdir("metadata") + pathlib.Path(f"metadata/{appid}.yml").write_text( + textwrap.dedent( + """ + RepoType: git + Builds: + - versionCode: 1 + commit: v1.0 + """ + ) + ) + fdroidserver.scanner.main() + self.assertTrue(os.path.exists("build")) + def test_scan_source_files(self): fdroidserver.common.options = mock.Mock() fdroidserver.common.options.json = False