kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

add test files to pre-commit hook and fix pep8 errors

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2015-07-21 23:19:56 -07:00
parent 84c9777e9e
commit 9e5dd19fc8
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/pre-commit
View File

@ -6,7 +6,7 @@
# Redirect output to stderr. # Redirect output to stderr.
exec 1>&2 exec 1>&2
PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py" PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py tests/*.TestCase"
SH_FILES="hooks/pre-commit" SH_FILES="hooks/pre-commit"
BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion" BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion"
RB_FILES="buildserver/cookbooks/*/recipes/*.rb" RB_FILES="buildserver/cookbooks/*/recipes/*.rb"

16
tests/common.TestCase
View File

@ -12,16 +12,16 @@ import sys
import tempfile import tempfile
import unittest import unittest
localmodule = os.path.realpath(os.path.join( localmodule = os.path.realpath(
os.path.dirname(inspect.getfile(inspect.currentframe())), os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
'..'))
print('localmodule: ' + localmodule) print('localmodule: ' + localmodule)
if localmodule not in sys.path: if localmodule not in sys.path:
sys.path.insert(0,localmodule) sys.path.insert(0, localmodule)
import fdroidserver.common import fdroidserver.common
import fdroidserver.metadata import fdroidserver.metadata
class CommonTest(unittest.TestCase): class CommonTest(unittest.TestCase):
'''fdroidserver/common.py''' '''fdroidserver/common.py'''
@ -50,7 +50,7 @@ class CommonTest(unittest.TestCase):
def test_find_sdk_tools_cmd(self): def test_find_sdk_tools_cmd(self):
fdroidserver.common.config = dict() fdroidserver.common.config = dict()
# TODO add this once everything works without sdk_path set in config # TODO add this once everything works without sdk_path set in config
#self._find_all() # self._find_all()
sdk_path = os.getenv('ANDROID_HOME') sdk_path = os.getenv('ANDROID_HOME')
if os.path.exists(sdk_path): if os.path.exists(sdk_path):
fdroidserver.common.config['sdk_path'] = sdk_path fdroidserver.common.config['sdk_path'] = sdk_path
@ -67,7 +67,7 @@ class CommonTest(unittest.TestCase):
config = dict() config = dict()
config['sdk_path'] = os.getenv('ANDROID_HOME') config['sdk_path'] = os.getenv('ANDROID_HOME')
fdroidserver.common.config = config fdroidserver.common.config = config
self._set_build_tools(); self._set_build_tools()
config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt') config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt')
# these are set debuggable # these are set debuggable
testfiles = [] testfiles = []
@ -91,13 +91,13 @@ class CommonTest(unittest.TestCase):
for name in ["org.fdroid.fdroid", for name in ["org.fdroid.fdroid",
"org.f_droid.fdr0ID"]: "org.f_droid.fdr0ID"]:
self.assertTrue(fdroidserver.common.is_valid_package_name(name), self.assertTrue(fdroidserver.common.is_valid_package_name(name),
"{0} should be a valid package name".format(name)) "{0} should be a valid package name".format(name))
for name in ["0rg.fdroid.fdroid", for name in ["0rg.fdroid.fdroid",
".f_droid.fdr0ID", ".f_droid.fdr0ID",
"org.fdroid/fdroid", "org.fdroid/fdroid",
"/org.fdroid.fdroid"]: "/org.fdroid.fdroid"]:
self.assertFalse(fdroidserver.common.is_valid_package_name(name), self.assertFalse(fdroidserver.common.is_valid_package_name(name),
"{0} should not be a valid package name".format(name)) "{0} should not be a valid package name".format(name))
def test_prepare_sources(self): def test_prepare_sources(self):
testint = 99999999 testint = 99999999

8
tests/install.TestCase
View File

@ -9,16 +9,16 @@ import os
import sys import sys
import unittest import unittest
localmodule = os.path.realpath(os.path.join( localmodule = os.path.realpath(
os.path.dirname(inspect.getfile(inspect.currentframe())), os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
'..'))
print('localmodule: ' + localmodule) print('localmodule: ' + localmodule)
if localmodule not in sys.path: if localmodule not in sys.path:
sys.path.insert(0,localmodule) sys.path.insert(0, localmodule)
import fdroidserver.common import fdroidserver.common
import fdroidserver.install import fdroidserver.install
class InstallTest(unittest.TestCase): class InstallTest(unittest.TestCase):
'''fdroidserver/install.py''' '''fdroidserver/install.py'''

9
tests/update.TestCase
View File

@ -4,22 +4,23 @@
# http://www.drdobbs.com/testing/unit-testing-with-python/240165163 # http://www.drdobbs.com/testing/unit-testing-with-python/240165163
import inspect import inspect
import logging
import optparse import optparse
import os import os
import sys import sys
import unittest import unittest
localmodule = os.path.realpath(os.path.join( localmodule = os.path.realpath(
os.path.dirname(inspect.getfile(inspect.currentframe())), os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
'..'))
print('localmodule: ' + localmodule) print('localmodule: ' + localmodule)
if localmodule not in sys.path: if localmodule not in sys.path:
sys.path.insert(0,localmodule) sys.path.insert(0, localmodule)
import fdroidserver.common import fdroidserver.common
import fdroidserver.update import fdroidserver.update
from fdroidserver.common import FDroidPopen from fdroidserver.common import FDroidPopen
class UpdateTest(unittest.TestCase): class UpdateTest(unittest.TestCase):
'''fdroid update''' '''fdroid update'''