mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
CI: install pyjks as dependency for tests
This commit is contained in:
parent
a114c73c2d
commit
d9a6bfb0a9
@ -6,7 +6,7 @@ variables:
|
|||||||
test:
|
test:
|
||||||
image: registry.gitlab.com/fdroid/ci-images-server:latest
|
image: registry.gitlab.com/fdroid/ci-images-server:latest
|
||||||
script:
|
script:
|
||||||
- $pip install -e .
|
- $pip install -e .[test]
|
||||||
- cd tests
|
- cd tests
|
||||||
- ./complete-ci-tests
|
- ./complete-ci-tests
|
||||||
|
|
||||||
|
4
setup.py
4
setup.py
@ -52,7 +52,6 @@ def get_data_files():
|
|||||||
with open("README.md", "r") as fh:
|
with open("README.md", "r") as fh:
|
||||||
long_description = fh.read()
|
long_description = fh.read()
|
||||||
|
|
||||||
|
|
||||||
setup(name='fdroidserver',
|
setup(name='fdroidserver',
|
||||||
version='1.2a',
|
version='1.2a',
|
||||||
description='F-Droid Server Tools',
|
description='F-Droid Server Tools',
|
||||||
@ -88,6 +87,9 @@ setup(name='fdroidserver',
|
|||||||
'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
|
'requests >= 2.5.2, != 2.11.0, != 2.12.2, != 2.18.0',
|
||||||
'yamllint',
|
'yamllint',
|
||||||
],
|
],
|
||||||
|
extras_require={
|
||||||
|
'test': ['pyjks'],
|
||||||
|
},
|
||||||
classifiers=[
|
classifiers=[
|
||||||
'Development Status :: 4 - Beta',
|
'Development Status :: 4 - Beta',
|
||||||
'Intended Audience :: Developers',
|
'Intended Audience :: Developers',
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import inspect
|
import inspect
|
||||||
import jks, jks.util
|
|
||||||
import logging
|
import logging
|
||||||
import optparse
|
import optparse
|
||||||
import os
|
import os
|
||||||
@ -192,6 +191,11 @@ class PublishTest(unittest.TestCase):
|
|||||||
self.assertEqual(len(randomappids), len(allaliases))
|
self.assertEqual(len(randomappids), len(allaliases))
|
||||||
|
|
||||||
def test_create_key_if_not_existing(self):
|
def test_create_key_if_not_existing(self):
|
||||||
|
try:
|
||||||
|
import jks
|
||||||
|
import jks.util
|
||||||
|
except ImportError:
|
||||||
|
self.skipTest("pyjks not installed")
|
||||||
common.config = {}
|
common.config = {}
|
||||||
common.fill_config_defaults(common.config)
|
common.fill_config_defaults(common.config)
|
||||||
publish.config = common.config
|
publish.config = common.config
|
||||||
|
Loading…
Reference in New Issue
Block a user