mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-04 14:30:30 +03:00
easy changes to black code format in test cases
This does not change areas of code that should be manually reformatted.
This commit is contained in:
Hans-Christoph Steiner
parent
d95a3029a8
commit
d05ff9db1d
18 changed files with 1144 additions and 564 deletions
|
|
@ -15,7 +15,8 @@ import json
|
|||
import shutil
|
||||
|
||||
localmodule = os.path.realpath(
|
||||
os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
|
||||
os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')
|
||||
)
|
||||
print('localmodule: ' + localmodule)
|
||||
if localmodule not in sys.path:
|
||||
sys.path.insert(0, localmodule)
|
||||
|
|
@ -37,7 +38,6 @@ class Options:
|
|||
|
||||
|
||||
class IndexTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
self.basedir = os.path.join(localmodule, 'tests')
|
||||
|
|
@ -55,8 +55,9 @@ class IndexTest(unittest.TestCase):
|
|||
fdroidserver.signindex.config = config
|
||||
|
||||
if not os.path.exists('repo/index-v1.jar'):
|
||||
fdroidserver.signindex.sign_index_v1(os.path.join(self.basedir, 'repo'),
|
||||
'index-v1.json')
|
||||
fdroidserver.signindex.sign_index_v1(
|
||||
os.path.join(self.basedir, 'repo'), 'index-v1.json'
|
||||
)
|
||||
|
||||
def test_get_public_key_from_jar_succeeds(self):
|
||||
source_dir = os.path.join(self.basedir, 'signindex')
|
||||
|
|
@ -66,9 +67,11 @@ class IndexTest(unittest.TestCase):
|
|||
_, fingerprint = fdroidserver.index.get_public_key_from_jar(jar)
|
||||
# comparing fingerprints should be sufficient
|
||||
if f == 'testy.jar':
|
||||
self.assertEqual(fingerprint,
|
||||
'818E469465F96B704E27BE2FEE4C63AB'
|
||||
+ '9F83DDF30E7A34C7371A4728D83B0BC1')
|
||||
self.assertEqual(
|
||||
fingerprint,
|
||||
'818E469465F96B704E27BE2FEE4C63AB'
|
||||
+ '9F83DDF30E7A34C7371A4728D83B0BC1',
|
||||
)
|
||||
if f == 'guardianproject.jar':
|
||||
self.assertTrue(fingerprint == GP_FINGERPRINT)
|
||||
|
||||
|
|
@ -85,12 +88,15 @@ class IndexTest(unittest.TestCase):
|
|||
|
||||
def test_download_repo_index_no_jar(self):
|
||||
with self.assertRaises(requests.exceptions.RequestException):
|
||||
fdroidserver.index.download_repo_index("http://example.org?fingerprint=nope")
|
||||
fdroidserver.index.download_repo_index(
|
||||
"http://example.org?fingerprint=nope"
|
||||
)
|
||||
|
||||
def test_get_repo_key_fingerprint(self):
|
||||
pubkey, fingerprint = fdroidserver.index.extract_pubkey()
|
||||
data, public_key, public_key_fingerprint = \
|
||||
fdroidserver.index.get_index_from_jar('repo/index-v1.jar', fingerprint)
|
||||
data, public_key, public_key_fingerprint = fdroidserver.index.get_index_from_jar(
|
||||
'repo/index-v1.jar', fingerprint
|
||||
)
|
||||
self.assertIsNotNone(data)
|
||||
self.assertIsNotNone(public_key)
|
||||
self.assertIsNotNone(public_key_fingerprint)
|
||||
|
|
@ -103,8 +109,9 @@ class IndexTest(unittest.TestCase):
|
|||
|
||||
def test_get_index_from_jar_with_chars_to_be_stripped(self):
|
||||
fingerprint = 'NOOOO F4 9A F3 F1 1E FD DF 20 DF FD 70 F5 E3 11 7B 99 76 67 41 67 AD CA 28 0E 6B 19 32 A0 60 1B 26 F6'
|
||||
data, public_key, public_key_fingerprint = \
|
||||
fdroidserver.index.get_index_from_jar('repo/index-v1.jar', fingerprint)
|
||||
data, public_key, public_key_fingerprint = fdroidserver.index.get_index_from_jar(
|
||||
'repo/index-v1.jar', fingerprint
|
||||
)
|
||||
|
||||
@patch('requests.head')
|
||||
def test_download_repo_index_same_etag(self, head):
|
||||
|
|
@ -243,13 +250,15 @@ class IndexTest(unittest.TestCase):
|
|||
pass
|
||||
|
||||
fdroidserver.index.v1_sort_packages(
|
||||
i, fdroidserver.common.load_stats_fdroid_signing_key_fingerprints())
|
||||
i, fdroidserver.common.load_stats_fdroid_signing_key_fingerprints()
|
||||
)
|
||||
self.maxDiff = None
|
||||
self.assertEqual(json.dumps(i, indent=2), json.dumps(o, indent=2))
|
||||
|
||||
def test_make_v0_repo_only(self):
|
||||
tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
|
||||
dir=self.tmpdir)
|
||||
tmptestsdir = tempfile.mkdtemp(
|
||||
prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir
|
||||
)
|
||||
os.chdir(tmptestsdir)
|
||||
os.mkdir('repo')
|
||||
repo_icons_dir = os.path.join('repo', 'icons')
|
||||
|
|
@ -266,19 +275,24 @@ class IndexTest(unittest.TestCase):
|
|||
fdroidserver.common.config['repo_pubkey'] = 'ffffffffffffffffffffffffffffffffff'
|
||||
fdroidserver.index.make_v0({}, [], 'repo', repodict, requestsdict, {})
|
||||
self.assertTrue(os.path.isdir(repo_icons_dir))
|
||||
self.assertTrue(os.path.exists(os.path.join(repo_icons_dir,
|
||||
fdroidserver.common.default_config['repo_icon'])))
|
||||
self.assertTrue(
|
||||
os.path.exists(
|
||||
os.path.join(
|
||||
repo_icons_dir, fdroidserver.common.default_config['repo_icon']
|
||||
)
|
||||
)
|
||||
)
|
||||
self.assertTrue(os.path.exists(os.path.join('repo', 'index.xml')))
|
||||
|
||||
def test_make_v0(self):
|
||||
tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
|
||||
dir=self.tmpdir)
|
||||
tmptestsdir = tempfile.mkdtemp(
|
||||
prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir
|
||||
)
|
||||
os.chdir(tmptestsdir)
|
||||
os.mkdir('metadata')
|
||||
os.mkdir('repo')
|
||||
metadatafile = 'metadata/info.zwanenburg.caffeinetile.yml'
|
||||
shutil.copy(os.path.join(self.basedir, metadatafile),
|
||||
metadatafile)
|
||||
shutil.copy(os.path.join(self.basedir, metadatafile), metadatafile)
|
||||
repo_icons_dir = os.path.join('repo', 'icons')
|
||||
self.assertFalse(os.path.isdir(repo_icons_dir))
|
||||
repodict = {
|
||||
|
|
@ -296,21 +310,14 @@ class IndexTest(unittest.TestCase):
|
|||
apk = {
|
||||
'hash': 'dbbdd7deadb038862f426b71efe4a64df8c3edf25d669e935f349510e16f65db',
|
||||
'hashType': 'sha256',
|
||||
'uses-permission': [
|
||||
[
|
||||
'android.permission.WAKE_LOCK',
|
||||
None
|
||||
]
|
||||
],
|
||||
'uses-permission': [['android.permission.WAKE_LOCK', None]],
|
||||
'uses-permission-sdk-23': [],
|
||||
'features': [],
|
||||
'icons_src': {
|
||||
'160': 'res/drawable/ic_coffee_on.xml',
|
||||
'-1': 'res/drawable/ic_coffee_on.xml'
|
||||
},
|
||||
'icons': {
|
||||
'160': 'info.zwanenburg.caffeinetile.4.xml'
|
||||
'-1': 'res/drawable/ic_coffee_on.xml',
|
||||
},
|
||||
'icons': {'160': 'info.zwanenburg.caffeinetile.4.xml'},
|
||||
'antiFeatures': [],
|
||||
'packageName': 'info.zwanenburg.caffeinetile',
|
||||
'versionCode': 4,
|
||||
|
|
@ -330,33 +337,45 @@ class IndexTest(unittest.TestCase):
|
|||
fdroidserver.common.config['make_current_version_link'] = True
|
||||
fdroidserver.index.make_v0(apps, [apk], 'repo', repodict, requestsdict, {})
|
||||
self.assertTrue(os.path.isdir(repo_icons_dir))
|
||||
self.assertTrue(os.path.exists(os.path.join(repo_icons_dir,
|
||||
fdroidserver.common.default_config['repo_icon'])))
|
||||
self.assertTrue(
|
||||
os.path.exists(
|
||||
os.path.join(
|
||||
repo_icons_dir, fdroidserver.common.default_config['repo_icon']
|
||||
)
|
||||
)
|
||||
)
|
||||
self.assertTrue(os.path.exists(os.path.join('repo', 'index.xml')))
|
||||
|
||||
def test_get_mirror_service_urls(self):
|
||||
for url in [
|
||||
'git@github.com:foo/bar',
|
||||
'git@github.com:foo/bar.git',
|
||||
'https://github.com/foo/bar',
|
||||
'https://github.com/foo/bar.git',
|
||||
'git@github.com:foo/bar',
|
||||
'git@github.com:foo/bar.git',
|
||||
'https://github.com/foo/bar',
|
||||
'https://github.com/foo/bar.git',
|
||||
]:
|
||||
self.assertEqual(['https://raw.githubusercontent.com/foo/bar/master/fdroid'],
|
||||
fdroidserver.index.get_mirror_service_urls(url))
|
||||
self.assertEqual(
|
||||
['https://raw.githubusercontent.com/foo/bar/master/fdroid'],
|
||||
fdroidserver.index.get_mirror_service_urls(url),
|
||||
)
|
||||
|
||||
for url in [
|
||||
'git@gitlab.com:group/project',
|
||||
'git@gitlab.com:group/project.git',
|
||||
'https://gitlab.com/group/project',
|
||||
'https://gitlab.com/group/project.git',
|
||||
'git@gitlab.com:group/project',
|
||||
'git@gitlab.com:group/project.git',
|
||||
'https://gitlab.com/group/project',
|
||||
'https://gitlab.com/group/project.git',
|
||||
]:
|
||||
self.assertEqual(['https://group.gitlab.io/project/fdroid',
|
||||
'https://gitlab.com/group/project/-/raw/master/fdroid'],
|
||||
fdroidserver.index.get_mirror_service_urls(url))
|
||||
self.assertEqual(
|
||||
[
|
||||
'https://group.gitlab.io/project/fdroid',
|
||||
'https://gitlab.com/group/project/-/raw/master/fdroid',
|
||||
],
|
||||
fdroidserver.index.get_mirror_service_urls(url),
|
||||
)
|
||||
|
||||
def test_make_website(self):
|
||||
tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
|
||||
dir=self.tmpdir)
|
||||
tmptestsdir = tempfile.mkdtemp(
|
||||
prefix=inspect.currentframe().f_code.co_name, dir=self.tmpdir
|
||||
)
|
||||
os.chdir(tmptestsdir)
|
||||
os.mkdir('metadata')
|
||||
os.mkdir('repo')
|
||||
|
|
@ -396,21 +415,31 @@ class IndexTest(unittest.TestCase):
|
|||
self.assertEquals(css, pretty_css)
|
||||
|
||||
def test_v1_sort_packages_with_invalid(self):
|
||||
i = [{'packageName': 'org.smssecure.smssecure',
|
||||
'apkName': 'smssecure-custom.fake',
|
||||
'signer': None,
|
||||
'versionCode': 11111}]
|
||||
i = [
|
||||
{
|
||||
'packageName': 'org.smssecure.smssecure',
|
||||
'apkName': 'smssecure-custom.fake',
|
||||
'signer': None,
|
||||
'versionCode': 11111,
|
||||
}
|
||||
]
|
||||
|
||||
fdroidserver.index.v1_sort_packages(
|
||||
i, fdroidserver.common.load_stats_fdroid_signing_key_fingerprints())
|
||||
i, fdroidserver.common.load_stats_fdroid_signing_key_fingerprints()
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
os.chdir(os.path.dirname(__file__))
|
||||
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option("-v", "--verbose", action="store_true", default=False,
|
||||
help="Spew out even more information than normal")
|
||||
parser.add_option(
|
||||
"-v",
|
||||
"--verbose",
|
||||
action="store_true",
|
||||
default=False,
|
||||
help="Spew out even more information than normal",
|
||||
)
|
||||
(options, args) = parser.parse_args()
|
||||
Options.verbose = options.verbose
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue