mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-07-05 08:50:08 +02:00
Merge branch 'release-test-overhaul' into 'master'
release test overhaul See merge request fdroid/fdroidserver!499
This commit is contained in:
Hans-Christoph Steiner
commit
a76c5cc0b3
@ -30,6 +30,7 @@ metadata_v0:
|
||||
- git reset --hard
|
||||
- git checkout $GITCOMMIT
|
||||
- cd fdroiddata
|
||||
- echo "accepted_formats = ('txt', 'yml')" >> config.py
|
||||
- ../tests/dump_internal_metadata_format.py
|
||||
- sed -i
|
||||
-e '/Translation:/d'
|
||||
@ -79,6 +80,28 @@ ubuntu_lts:
|
||||
- cd tests
|
||||
- ./run-tests
|
||||
|
||||
# test using TrustyLTS with all depends from pypi
|
||||
ubuntu_trusty_pip:
|
||||
image: ubuntu:trusty
|
||||
only:
|
||||
- master@fdroid/fdroidserver
|
||||
variables:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
LANG: C.UTF-8
|
||||
script:
|
||||
- echo Etc/UTC > /etc/timezone
|
||||
- apt-get -qy update
|
||||
- apt-get -qy dist-upgrade
|
||||
- apt-get -qy install git default-jdk python3-pip python3.4-venv
|
||||
- rm -rf env
|
||||
- pyvenv-3.4 env
|
||||
- . env/bin/activate
|
||||
- echo sed -i "s/'requests.*',$/'requests',/" setup.py
|
||||
- pip3 install --upgrade babel pip setuptools
|
||||
- pip3 install -e .
|
||||
- ./setup.py compile_catalog
|
||||
- ./tests/run-tests
|
||||
|
||||
pip_install:
|
||||
image: archlinux/base
|
||||
only:
|
||||
@ -98,6 +121,30 @@ pip_install:
|
||||
- fdroid readmeta
|
||||
- fdroid update --help
|
||||
|
||||
pyup_io_safety_check:
|
||||
image: archlinux/base
|
||||
script:
|
||||
- pacman --sync --sysupgrade --refresh --noconfirm grep python-pip python-virtualenv tar
|
||||
- ./setup.py compile_catalog install
|
||||
- pip install safety
|
||||
- safety check --full-report
|
||||
|
||||
pylint:
|
||||
image: alpine:3.7
|
||||
variables:
|
||||
LANG: C.UTF-8
|
||||
script:
|
||||
- apk add --no-cache ca-certificates python3
|
||||
- python3 -m ensurepip
|
||||
- pip3 install pylint
|
||||
- pylint --rcfile=.pylint-rcfile --output-format=colorized --reports=n
|
||||
fdroid
|
||||
makebuildserver
|
||||
setup.py
|
||||
fdroidserver/*.py
|
||||
tests/*.py
|
||||
tests/*.TestCase
|
||||
|
||||
fedora_latest:
|
||||
image: fedora:latest
|
||||
only:
|
||||
|
||||
32
.travis.yml
32
.travis.yml
@ -24,27 +24,18 @@ matrix:
|
||||
# is used on Windows Subsystem for Linux.
|
||||
addons:
|
||||
apt:
|
||||
update: true
|
||||
sources:
|
||||
- sourceline: 'ppa:fdroid/fdroidserver'
|
||||
packages:
|
||||
- bash
|
||||
- dash
|
||||
- pylint
|
||||
- pep8
|
||||
- python3-babel
|
||||
- python3-dev
|
||||
- python3-pip
|
||||
- python3-ruamel.yaml
|
||||
- python3-setuptools
|
||||
- python3.4-venv
|
||||
- libjpeg-dev
|
||||
- zlib1g-dev
|
||||
- fdroidserver
|
||||
- python3-babel
|
||||
- python3-setuptools
|
||||
- fdroidserver
|
||||
|
||||
android:
|
||||
components:
|
||||
- android-23 # required for `fdroid build` test
|
||||
- build-tools-25.0.3 # required for `fdroid build` test
|
||||
- build-tools-27.0.3 # required for `fdroid build` test
|
||||
licenses:
|
||||
- 'android-sdk-preview-.+'
|
||||
- 'android-sdk-license-.+'
|
||||
@ -101,15 +92,12 @@ install:
|
||||
fi
|
||||
|
||||
# The OSX tests seem to run slower, they often timeout. So only run
|
||||
# the test suite with the installed version of fdroid, instead of the
|
||||
# three rounds that ./complete-ci-tests does.
|
||||
# the test suite with the installed version of fdroid.
|
||||
#
|
||||
# Supporting pip on Ubuntu/trusty was too painful here, since it seems
|
||||
# that pip installs conflict with the Ubuntu packages.
|
||||
script:
|
||||
- cd tests
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
./run-tests;
|
||||
else
|
||||
./complete-ci-tests;
|
||||
fi
|
||||
- ./tests/run-tests
|
||||
|
||||
after_failure:
|
||||
- cd $TRAVIS_BUILD_DIR
|
||||
|
||||
@ -163,7 +163,7 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
|
||||
output['requests'] = requestsdict
|
||||
|
||||
# establish sort order of the index
|
||||
v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints)
|
||||
v1_sort_packages(packages, fdroid_signing_key_fingerprints)
|
||||
|
||||
appslist = []
|
||||
output['apps'] = appslist
|
||||
@ -252,7 +252,7 @@ def make_v1(apps, packages, repodir, repodict, requestsdict, fdroid_signing_key_
|
||||
signindex.sign_index_v1(repodir, json_name)
|
||||
|
||||
|
||||
def v1_sort_packages(packages, repodir, fdroid_signing_key_fingerprints):
|
||||
def v1_sort_packages(packages, fdroid_signing_key_fingerprints):
|
||||
"""Sorts the supplied list to ensure a deterministic sort order for
|
||||
package entries in the index file. This sort-order also expresses
|
||||
installation preference to the clients.
|
||||
|
||||
@ -52,7 +52,7 @@ def publish_source_tarball(apkfilename, unsigned_dir, output_dir):
|
||||
logging.debug('...no source tarball for %s', apkfilename)
|
||||
|
||||
|
||||
def key_alias(appid, resolve=False):
|
||||
def key_alias(appid):
|
||||
"""Get the alias which F-Droid uses to indentify the singing key
|
||||
for this App in F-Droids keystore.
|
||||
"""
|
||||
|
||||
@ -45,7 +45,7 @@ def extract_signature(apkpath):
|
||||
return sigdir
|
||||
|
||||
|
||||
def extract(config, options):
|
||||
def extract(options):
|
||||
|
||||
# Create tmp dir if missing…
|
||||
tmp_dir = 'tmp'
|
||||
|
||||
@ -107,5 +107,3 @@ fi
|
||||
../fdroid build --verbose --stop org.adaway:55
|
||||
# building old versions should still work
|
||||
../fdroid build --verbose --stop org.fdroid.fdroid:96150
|
||||
# test OTA update ZIP build and publish
|
||||
../fdroid build --verbose --stop org.fdroid.fdroid.privileged.ota:2070
|
||||
|
||||
5
setup.py
5
setup.py
@ -82,14 +82,15 @@ setup(name='fdroidserver',
|
||||
'babel',
|
||||
],
|
||||
install_requires=[
|
||||
'androguard >= 3.1.0rc2',
|
||||
'clint',
|
||||
'GitPython',
|
||||
'mwclient',
|
||||
'paramiko',
|
||||
'Pillow',
|
||||
'apache-libcloud >= 0.14.1',
|
||||
'pyasn1',
|
||||
'pyasn1-modules',
|
||||
'pyasn1 <0.5.0, >=0.4.1',
|
||||
'pyasn1-modules == 0.2.1',
|
||||
'python-vagrant',
|
||||
'PyYAML',
|
||||
'qrcode',
|
||||
|
||||
@ -27,6 +27,11 @@ if [ -z $ANDROID_HOME ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! which pyvenv; then
|
||||
echo "pyvenv required to run this test suite!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
apksource=$1
|
||||
|
||||
#------------------------------------------------------------------------------#
|
||||
@ -35,31 +40,12 @@ if [ -z $PIP_DOWNLOAD_CACHE ]; then
|
||||
export PIP_DOWNLOAD_CACHE=$HOME/.pip_download_cache
|
||||
fi
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------#
|
||||
# required Java 7 or later keytool/jarsigner for :file support
|
||||
|
||||
export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------#
|
||||
# run local tests, don't scan fdroidserver/ project for APKs
|
||||
|
||||
cd $WORKSPACE/tests
|
||||
./run-tests $apksource
|
||||
|
||||
#------------------------------------------------------------------------------#
|
||||
# find pyvenv, to support Ubuntu/trusty's python3.4-venv
|
||||
|
||||
if which pyvenv; then
|
||||
pyvenv=pyvenv
|
||||
elif which pyvenv-3.4; then
|
||||
pyvenv=pyvenv-3.4
|
||||
else
|
||||
echo "pyvenv required to run this test suite!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------#
|
||||
# make sure that translations do not cause stacktraces
|
||||
@ -78,10 +64,8 @@ done
|
||||
# test install using install direct from git repo
|
||||
cd $WORKSPACE
|
||||
rm -rf $WORKSPACE/env
|
||||
$pyvenv $WORKSPACE/env
|
||||
pyvenv $WORKSPACE/env
|
||||
. $WORKSPACE/env/bin/activate
|
||||
# workaround https://github.com/pypa/setuptools/issues/937
|
||||
pip3 install --quiet setuptools==33.1.1 Babel
|
||||
pip3 install --quiet -e $WORKSPACE
|
||||
python3 setup.py compile_catalog install
|
||||
|
||||
@ -90,19 +74,3 @@ test -e $WORKSPACE/env/share/locale/de/LC_MESSAGES/fdroidserver.mo
|
||||
|
||||
# run tests in new pip+pyvenv install
|
||||
fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------#
|
||||
# run pylint
|
||||
|
||||
# only run it where it will work, for example, the pyvenvs above don't have pylint
|
||||
if which pylint3 && python3 -c "import pylint" 2> /dev/null; then
|
||||
cd $WORKSPACE
|
||||
pylint3 --rcfile=.pylint-rcfile --output-format=colorized --reports=n \
|
||||
fdroid \
|
||||
makebuildserver \
|
||||
setup.py \
|
||||
fdroidserver/*.py \
|
||||
tests/*.py \
|
||||
tests/*.TestCase
|
||||
fi
|
||||
|
||||
@ -211,7 +211,7 @@ class IndexTest(unittest.TestCase):
|
||||
pass
|
||||
|
||||
fdroidserver.index.v1_sort_packages(
|
||||
i, 'repo', 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))
|
||||
|
||||
|
||||
155
tests/run-tests
155
tests/run-tests
@ -156,31 +156,32 @@ $fdroid --version
|
||||
#------------------------------------------------------------------------------#
|
||||
echo_header 'run process when building and signing are on separate machines'
|
||||
|
||||
REPOROOT=`create_test_dir`
|
||||
cd $REPOROOT
|
||||
cp $WORKSPACE/tests/keystore.jks $REPOROOT/
|
||||
$fdroid init --keystore keystore.jks --repo-keyalias=sova
|
||||
echo 'keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
|
||||
echo 'keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
|
||||
echo "accepted_formats = ['txt', 'yml']" >> config.py
|
||||
echo 'keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.py
|
||||
test -d archive || mkdir archive
|
||||
test -d metadata || mkdir metadata
|
||||
cp $WORKSPACE/tests/metadata/info.guardianproject.urzip.yml metadata/
|
||||
test -d repo || mkdir repo
|
||||
test -d unsigned || mkdir unsigned
|
||||
cp $WORKSPACE/tests/urzip-release-unsigned.apk unsigned/info.guardianproject.urzip_100.apk
|
||||
$fdroid publish --verbose
|
||||
$fdroid update --verbose --nosign
|
||||
$fdroid signindex --verbose
|
||||
test -e repo/index.xml
|
||||
test -e repo/index.jar
|
||||
test -e repo/index-v1.jar
|
||||
test -e tmp/apkcache
|
||||
! test -z tmp/apkcache
|
||||
test -L urzip.apk
|
||||
grep -F '<application id=' repo/index.xml > /dev/null
|
||||
|
||||
if which zipalign || ls -1 $ANDROID_HOME/build-tools/*/zipalign; then
|
||||
REPOROOT=`create_test_dir`
|
||||
cd $REPOROOT
|
||||
cp $WORKSPACE/tests/keystore.jks $REPOROOT/
|
||||
$fdroid init --keystore keystore.jks --repo-keyalias=sova
|
||||
echo 'keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
|
||||
echo 'keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py
|
||||
echo "accepted_formats = ['txt', 'yml']" >> config.py
|
||||
echo 'keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US"' >> config.py
|
||||
test -d archive || mkdir archive
|
||||
test -d metadata || mkdir metadata
|
||||
cp $WORKSPACE/tests/metadata/info.guardianproject.urzip.yml metadata/
|
||||
test -d repo || mkdir repo
|
||||
test -d unsigned || mkdir unsigned
|
||||
cp $WORKSPACE/tests/urzip-release-unsigned.apk unsigned/info.guardianproject.urzip_100.apk
|
||||
$fdroid publish --verbose
|
||||
$fdroid update --verbose --nosign
|
||||
$fdroid signindex --verbose
|
||||
test -e repo/index.xml
|
||||
test -e repo/index.jar
|
||||
test -e repo/index-v1.jar
|
||||
test -e tmp/apkcache
|
||||
! test -z tmp/apkcache
|
||||
test -L urzip.apk
|
||||
grep -F '<application id=' repo/index.xml > /dev/null
|
||||
fi
|
||||
|
||||
#------------------------------------------------------------------------------#
|
||||
echo_header "test UTF-8 metadata"
|
||||
@ -1029,62 +1030,62 @@ test -e $KEYSTORE
|
||||
#------------------------------------------------------------------------------#
|
||||
echo_header "sign binary repo in offline box, then publishing from online box"
|
||||
|
||||
OFFLINE_ROOT=`create_test_dir`
|
||||
KEYSTORE=$WORKSPACE/tests/keystore.jks
|
||||
LOCAL_COPY_DIR=`create_test_dir`/fdroid
|
||||
mkdir $LOCAL_COPY_DIR
|
||||
ONLINE_ROOT=`create_test_dir`
|
||||
SERVERWEBROOT=`create_test_dir`
|
||||
|
||||
# create offline binary transparency log
|
||||
cd $OFFLINE_ROOT
|
||||
mkdir binary_transparency
|
||||
cd binary_transparency
|
||||
git init
|
||||
|
||||
# fake git remote server for binary transparency log
|
||||
BINARY_TRANSPARENCY_REMOTE=`create_test_dir`
|
||||
|
||||
# fake git remote server for repo mirror
|
||||
SERVER_GIT_MIRROR=`create_test_dir`
|
||||
cd $SERVER_GIT_MIRROR
|
||||
git init
|
||||
if have_git_2_3; then
|
||||
OFFLINE_ROOT=`create_test_dir`
|
||||
KEYSTORE=$WORKSPACE/tests/keystore.jks
|
||||
LOCAL_COPY_DIR=`create_test_dir`/fdroid
|
||||
mkdir $LOCAL_COPY_DIR
|
||||
ONLINE_ROOT=`create_test_dir`
|
||||
SERVERWEBROOT=`create_test_dir`
|
||||
|
||||
# create offline binary transparency log
|
||||
cd $OFFLINE_ROOT
|
||||
mkdir binary_transparency
|
||||
cd binary_transparency
|
||||
git init
|
||||
|
||||
# fake git remote server for binary transparency log
|
||||
BINARY_TRANSPARENCY_REMOTE=`create_test_dir`
|
||||
|
||||
# fake git remote server for repo mirror
|
||||
SERVER_GIT_MIRROR=`create_test_dir`
|
||||
cd $SERVER_GIT_MIRROR
|
||||
git init
|
||||
git config receive.denyCurrentBranch updateInstead
|
||||
|
||||
cd $OFFLINE_ROOT
|
||||
fdroid_init_with_prebuilt_keystore
|
||||
cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $OFFLINE_ROOT/
|
||||
|
||||
echo "mirrors = ['http://foo.bar/fdroid', 'http://asdflkdsfjafdsdfhkjh.onion/fdroid']" >> config.py
|
||||
echo "servergitmirrors = '$SERVER_GIT_MIRROR'" >> config.py
|
||||
echo "local_copy_dir = '$LOCAL_COPY_DIR'" >> config.py
|
||||
echo "accepted_formats = ['json', 'txt', 'yml']" >> config.py
|
||||
$fdroid update --pretty
|
||||
grep -F '<application id=' repo/index.xml > /dev/null
|
||||
grep -F '/fdroid/repo</mirror>' repo/index.xml
|
||||
grep -F '/fdroid/archive</mirror>' archive/index.xml
|
||||
test `grep '<mirror>' repo/index.xml | wc -l` -eq 2
|
||||
test `grep '<mirror>' archive/index.xml | wc -l` -eq 2
|
||||
cd binary_transparency
|
||||
[ `git rev-list --count HEAD` == "1" ]
|
||||
cd ..
|
||||
$fdroid server update --verbose
|
||||
grep -F '<application id=' $LOCAL_COPY_DIR/repo/index.xml > /dev/null
|
||||
cd $ONLINE_ROOT
|
||||
echo "local_copy_dir = '$LOCAL_COPY_DIR'" >> config.py
|
||||
echo "sync_from_local_copy_dir = True" >> config.py
|
||||
echo "serverwebroots = '$SERVERWEBROOT'" >> config.py
|
||||
echo "servergitmirrors = '$SERVER_GIT_MIRROR'" >> config.py
|
||||
echo "local_copy_dir = '$LOCAL_COPY_DIR'" >> config.py
|
||||
echo "binary_transparency_remote = '$BINARY_TRANSPARENCY_REMOTE'" >> config.py
|
||||
$fdroid server update --verbose
|
||||
cd $BINARY_TRANSPARENCY_REMOTE
|
||||
[ `git rev-list --count HEAD` == "1" ]
|
||||
cd $SERVER_GIT_MIRROR
|
||||
[ `git rev-list --count HEAD` == "1" ]
|
||||
fi
|
||||
|
||||
cd $OFFLINE_ROOT
|
||||
fdroid_init_with_prebuilt_keystore
|
||||
cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $OFFLINE_ROOT/
|
||||
|
||||
echo "mirrors = ['http://foo.bar/fdroid', 'http://asdflkdsfjafdsdfhkjh.onion/fdroid']" >> config.py
|
||||
echo "servergitmirrors = '$SERVER_GIT_MIRROR'" >> config.py
|
||||
echo "local_copy_dir = '$LOCAL_COPY_DIR'" >> config.py
|
||||
echo "accepted_formats = ['json', 'txt', 'yml']" >> config.py
|
||||
$fdroid update --pretty
|
||||
grep -F '<application id=' repo/index.xml > /dev/null
|
||||
grep -F '/fdroid/repo</mirror>' repo/index.xml
|
||||
grep -F '/fdroid/archive</mirror>' archive/index.xml
|
||||
test `grep '<mirror>' repo/index.xml | wc -l` -eq 2
|
||||
test `grep '<mirror>' archive/index.xml | wc -l` -eq 2
|
||||
cd binary_transparency
|
||||
[ `git rev-list --count HEAD` == "1" ]
|
||||
cd ..
|
||||
$fdroid server update --verbose
|
||||
grep -F '<application id=' $LOCAL_COPY_DIR/repo/index.xml > /dev/null
|
||||
cd $ONLINE_ROOT
|
||||
echo "local_copy_dir = '$LOCAL_COPY_DIR'" >> config.py
|
||||
echo "sync_from_local_copy_dir = True" >> config.py
|
||||
echo "serverwebroots = '$SERVERWEBROOT'" >> config.py
|
||||
echo "servergitmirrors = '$SERVER_GIT_MIRROR'" >> config.py
|
||||
echo "local_copy_dir = '$LOCAL_COPY_DIR'" >> config.py
|
||||
echo "binary_transparency_remote = '$BINARY_TRANSPARENCY_REMOTE'" >> config.py
|
||||
$fdroid server update --verbose
|
||||
cd $BINARY_TRANSPARENCY_REMOTE
|
||||
[ `git rev-list --count HEAD` == "1" ]
|
||||
cd $SERVER_GIT_MIRROR
|
||||
[ `git rev-list --count HEAD` == "1" ]
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------#
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ class SignaturesTest(unittest.TestCase):
|
||||
APK = [os.path.abspath(os.path.join('repo', 'com.politedroid_3.apk'))]
|
||||
|
||||
with TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
|
||||
signatures.extract(common.config, OptionsFixture())
|
||||
signatures.extract(OptionsFixture())
|
||||
|
||||
# check if extracted signatures are where they are supposed to be
|
||||
# also verify weather if extracted file contian what they should
|
||||
|
||||
Loading…
Reference in New Issue
Block a user