1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00

get tests working

This commit is contained in:
Michael Pöhn 2020-02-03 23:30:23 +01:00
parent aa020af040
commit 58776da694

View File

@ -725,16 +725,17 @@ class MetadataTest(unittest.TestCase):
Prepare: "[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\\\\ntarget=android-19' > project.properties" Prepare: "[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo -e 'android.library=true\\\\ntarget=android-19' > project.properties"
''')) '''))
srclib = fdroidserver.metadata.parse_yml_srclib('Changelog-cketti.yml') srclib = fdroidserver.metadata.parse_yml_srclib('Changelog-cketti.yml')
self.assertDictEqual({'Repo': 'https://github.com/cketti/ckChangeLog', self.assertDictEqual(srclib,
{'Repo': 'https://github.com/cketti/ckChangeLog',
'RepoType': 'git', 'RepoType': 'git',
'Subdir': ['library', 'ckChangeLog/src/main'], 'Subdir': ['library', 'ckChangeLog/src/main'],
'Prepare': "[ -f project.properties ] || echo 'source.dir=java' > " 'Prepare': "[ -f project.properties ] || echo 'source.dir=java' > "
"ant.properties && echo -e " "ant.properties && echo -e "
"'android.library=true\\ntarget=android-19' > project.properties"}, "'android.library=true\\ntarget=android-19' > project.properties"})
srclib)
def test_read_srclibs(self): def test_read_srclibs(self):
fdroidserver.metadata.warnings_action = 'error' fdroidserver.metadata.warnings_action = 'error'
fdroidserver.metadata.srclibs = None
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir): with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
os.mkdir('srclibs') os.mkdir('srclibs')
with open('srclibs/simple.yml', 'w', encoding='utf-8') as f: with open('srclibs/simple.yml', 'w', encoding='utf-8') as f:
@ -752,7 +753,6 @@ class MetadataTest(unittest.TestCase):
Prepare: Prepare:
''')) '''))
fdroidserver.metadata.read_srclibs() fdroidserver.metadata.read_srclibs()
print(fdroidserver.metadata.srclibs)
self.assertDictEqual(fdroidserver.metadata.srclibs, self.assertDictEqual(fdroidserver.metadata.srclibs,
{'simple-wb': {'RepoType': 'git', {'simple-wb': {'RepoType': 'git',
'Repo': 'https://git.host/repo.git', 'Repo': 'https://git.host/repo.git',