mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 15:30:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle str and pathlib.Path in getvcs()

Browse source
This commit is contained in:
Hans-Christoph Steiner 2023-02-20 22:38:30 +01:00
parent d0d15a205f
commit 24df262f6b
2 changed files with 54 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tests/common.TestCase
View file

@ -58,6 +58,7 @@ class CommonTest(unittest.TestCase):
fdroidserver.common.config = None
fdroidserver.common.options = mock.Mock()
fdroidserver.common.options.verbose = False
fdroidserver.metadata.srclibs = None
self._td = mkdtemp()
self.testdir = self._td.name
@ -412,6 +413,47 @@ class CommonTest(unittest.TestCase):
vcs1 = fdroidserver.common.getvcs('git', git_url, gitrepo)
vcs1.gotorevision('0.3', refresh=False)
def test_setup_vcs_srclib(self):
app = fdroidserver.metadata.App(
{
'RepoType': 'srclib',
'Repo': 'TransportsRennes',
}
)
srclib = {
'RepoType': 'git',
'Repo': 'https://github.com/ybonnel/TransportsRennes',
}
fdroidserver.metadata.srclibs = {'TransportsRennes': srclib}
vcs, build_dir = fdroidserver.common.setup_vcs(app)
self.assertIsNotNone(vcs)
self.assertEqual(build_dir, Path('build/srclib/TransportsRennes'))
def test_getvcs_srclib(self):
vcstype = 'srclib'
remote = 'TransportsRennes'
local = 'build/srclib/' + remote
fdroidserver.metadata.srclibs = {
remote: {
'RepoType': 'git',
'Repo': 'https://github.com/ybonnel/TransportsRennes',
}
}
self.assertIsNotNone(fdroidserver.common.getvcs(vcstype, remote, local))
self.assertIsNotNone(fdroidserver.common.getvcs(vcstype, Path(remote), local))
self.assertIsNotNone(fdroidserver.common.getvcs(vcstype, remote, Path(local)))
self.assertIsNotNone(fdroidserver.common.getvcs(
vcstype, Path(remote), Path(local)
))
with self.assertRaises(VCSException):
fdroidserver.common.getvcs(vcstype, remote, 'bad')
with self.assertRaises(VCSException):
fdroidserver.common.getvcs(vcstype, remote, Path('bad'))
with self.assertRaises(VCSException):
fdroidserver.common.getvcs(vcstype, Path(remote), 'bad')
with self.assertRaises(VCSException):
fdroidserver.common.getvcs(vcstype, Path(remote), Path('bad'))
def test_fdroid_popen_stderr_redirect(self):
config = dict()
fdroidserver.common.fill_config_defaults(config)