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

convert inline tests to .yml

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2020-06-09 22:34:23 +02:00
parent f0fb3b64f8
commit 0d1fddb82e
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tests/run-tests
View File

@ -226,15 +226,18 @@ REPOROOT=`create_test_dir`
cd $REPOROOT cd $REPOROOT
cp $WORKSPACE/examples/fdroid-icon.png $REPOROOT/ cp $WORKSPACE/examples/fdroid-icon.png $REPOROOT/
mkdir metadata mkdir metadata
echo "Auto Name:Just A Test" > metadata/org.fdroid.ci.test.app.txt echo "AutoName: Just A Test" > metadata/org.fdroid.ci.test.app.yml
echo "Web Site:" >> metadata/org.fdroid.ci.test.app.txt echo "WebSite: " >> metadata/org.fdroid.ci.test.app.yml
echo "Build:0.3,300" >> metadata/org.fdroid.ci.test.app.txt echo "Builds:" >> metadata/org.fdroid.ci.test.app.yml
echo " commit=0.3" >> metadata/org.fdroid.ci.test.app.txt echo " - versionName: 0.3" >> metadata/org.fdroid.ci.test.app.yml
echo " subdir=app" >> metadata/org.fdroid.ci.test.app.txt echo " versionCode: 300" >> metadata/org.fdroid.ci.test.app.yml
echo " gradle=yes" >> metadata/org.fdroid.ci.test.app.txt echo " commit: 0.3" >> metadata/org.fdroid.ci.test.app.yml
echo "" >> metadata/org.fdroid.ci.test.app.txt echo " subdir: app" >> metadata/org.fdroid.ci.test.app.yml
echo "Repo:https://gitlab.com/fdroid/ci-test-app.git" >> metadata/org.fdroid.ci.test.app.txt echo " gradle:" >> metadata/org.fdroid.ci.test.app.yml
echo "Repo Type:git" >> metadata/org.fdroid.ci.test.app.txt echo " - yes" >> metadata/org.fdroid.ci.test.app.yml
echo "" >> metadata/org.fdroid.ci.test.app.yml
echo "Repo: https://gitlab.com/fdroid/ci-test-app.git" >> metadata/org.fdroid.ci.test.app.yml
echo "RepoType: git" >> metadata/org.fdroid.ci.test.app.yml
mkdir build mkdir build
cp -a $WORKSPACE/tests/tmp/importer build/org.fdroid.ci.test.app cp -a $WORKSPACE/tests/tmp/importer build/org.fdroid.ci.test.app
ls -l build/org.fdroid.ci.test.app ls -l build/org.fdroid.ci.test.app
@ -293,10 +296,10 @@ cd $REPOROOT
fdroid_init_with_prebuilt_keystore fdroid_init_with_prebuilt_keystore
$sed -i.tmp '/allow_disabled_algorithms/d' config.py $sed -i.tmp '/allow_disabled_algorithms/d' config.py
test -d metadata || mkdir metadata test -d metadata || mkdir metadata
cp $WORKSPACE/tests/metadata/*.txt metadata/ cp $WORKSPACE/tests/metadata/*.yml metadata/
echo 'Summary:good test version of urzip' > metadata/info.guardianproject.urzip.txt echo 'Summary: good test version of urzip' > metadata/info.guardianproject.urzip.yml
echo 'Summary:good MD5 sig, which is disabled algorithm' > metadata/org.bitbucket.tickytacky.mirrormirror.txt echo 'Summary: good MD5 sig, which is disabled algorithm' > metadata/org.bitbucket.tickytacky.mirrormirror.yml
$sed -i.tmp '/Archive Policy:/d' metadata/*.txt $sed -i.tmp '/ArchivePolicy:/d' metadata/*.yml
test -d repo || mkdir repo test -d repo || mkdir repo
cp $WORKSPACE/tests/urzip.apk \ cp $WORKSPACE/tests/urzip.apk \
$WORKSPACE/tests/org.bitbucket.tickytacky.mirrormirror_[0-9].apk \ $WORKSPACE/tests/org.bitbucket.tickytacky.mirrormirror_[0-9].apk \
@ -341,7 +344,7 @@ if ! which apksigner; then
test -e repo/com.politedroid_6.apk test -e repo/com.politedroid_6.apk
echo "enable one app in the repo" echo "enable one app in the repo"
$sed -i.tmp 's,^Archive Policy:4,Archive Policy:1,' metadata/com.politedroid.txt $sed -i.tmp 's,^ArchivePolicy: 4,ArchivePolicy: 1,' metadata/com.politedroid.yml
$fdroid update --pretty --nosign $fdroid update --pretty --nosign
test `grep '<package>' archive/index.xml | wc -l` -eq 3 test `grep '<package>' archive/index.xml | wc -l` -eq 3
test `grep '<package>' repo/index.xml | wc -l` -eq 1 test `grep '<package>' repo/index.xml | wc -l` -eq 1
@ -355,7 +358,7 @@ if ! which apksigner; then
test -e repo/com.politedroid_6.apk test -e repo/com.politedroid_6.apk
echo "remove all apps from the repo" echo "remove all apps from the repo"
$sed -i.tmp 's,^Archive Policy:1,Archive Policy:0,' metadata/com.politedroid.txt $sed -i.tmp 's,^ArchivePolicy: 1,ArchivePolicy: 0,' metadata/com.politedroid.yml
$fdroid update --pretty --nosign $fdroid update --pretty --nosign
test `grep '<package>' archive/index.xml | wc -l` -eq 4 test `grep '<package>' archive/index.xml | wc -l` -eq 4
test `grep '<package>' repo/index.xml | wc -l` -eq 0 test `grep '<package>' repo/index.xml | wc -l` -eq 0
@ -370,7 +373,7 @@ if ! which apksigner; then
! test -e repo/com.politedroid_6.apk ! test -e repo/com.politedroid_6.apk
echo "move back one from archive to the repo" echo "move back one from archive to the repo"
$sed -i.tmp 's,^Archive Policy:0,Archive Policy:1,' metadata/com.politedroid.txt $sed -i.tmp 's,^ArchivePolicy: 0,ArchivePolicy: 1,' metadata/com.politedroid.yml
$fdroid update --pretty --nosign $fdroid update --pretty --nosign
test `grep '<package>' archive/index.xml | wc -l` -eq 3 test `grep '<package>' archive/index.xml | wc -l` -eq 3
test `grep '<package>' repo/index.xml | wc -l` -eq 1 test `grep '<package>' repo/index.xml | wc -l` -eq 1
@ -385,7 +388,7 @@ if ! which apksigner; then
test -e repo/com.politedroid_6.apk test -e repo/com.politedroid_6.apk
echo "set an earlier version as CVC and test that it's the only one not archived" echo "set an earlier version as CVC and test that it's the only one not archived"
$sed -i.tmp 's,^Current Version Code:6,Current Version Code:5,' metadata/com.politedroid.txt $sed -i.tmp 's,^CurrentVersionCode: 6,CurrentVersionCode: 5,' metadata/com.politedroid.yml
$fdroid update --pretty --nosign $fdroid update --pretty --nosign
test `grep '<package>' archive/index.xml | wc -l` -eq 3 test `grep '<package>' archive/index.xml | wc -l` -eq 3
test `grep '<package>' repo/index.xml | wc -l` -eq 1 test `grep '<package>' repo/index.xml | wc -l` -eq 1
@ -409,7 +412,7 @@ cd $REPOROOT
fdroid_init_with_prebuilt_keystore fdroid_init_with_prebuilt_keystore
test -d metadata || mkdir metadata test -d metadata || mkdir metadata
cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/ cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
$sed -i.tmp '/Archive Policy:/d' metadata/com.politedroid.txt $sed -i.tmp '/ArchivePolicy:/d' metadata/com.politedroid.yml
test -d repo || mkdir repo test -d repo || mkdir repo
cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk repo/ cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk repo/
$sed -i.tmp 's,archive_older = [0-9],archive_older = 3,' config.py $sed -i.tmp 's,archive_older = [0-9],archive_older = 3,' config.py
@ -440,7 +443,7 @@ test -e archive/com.politedroid_5.apk
test -e repo/com.politedroid_6.apk test -e repo/com.politedroid_6.apk
# disabling deletes from the archive # disabling deletes from the archive
$sed -i.tmp 's/Build:1.3,4/Build:1.3,4\n disable=testing deletion/' metadata/com.politedroid.txt $sed -i.tmp 's/\(versionCode: 4\)/\1\n disable: testing deletion/' metadata/com.politedroid.yml
$fdroid update --pretty --nosign $fdroid update --pretty --nosign
test `grep '<package>' archive/index.xml | wc -l` -eq 2 test `grep '<package>' archive/index.xml | wc -l` -eq 2
test `grep '<package>' repo/index.xml | wc -l` -eq 1 test `grep '<package>' repo/index.xml | wc -l` -eq 1
@ -454,7 +457,7 @@ test -e archive/com.politedroid_5.apk
test -e repo/com.politedroid_6.apk test -e repo/com.politedroid_6.apk
# disabling deletes from the repo, and promotes one from the archive # disabling deletes from the repo, and promotes one from the archive
$sed -i.tmp 's/Build:1.5,6/Build:1.5,6\n disable=testing deletion/' metadata/com.politedroid.txt $sed -i.tmp 's/\(versionCode: 6\)/\1\n disable: testing deletion/' metadata/com.politedroid.yml
$fdroid update --pretty --nosign $fdroid update --pretty --nosign
test `grep '<package>' archive/index.xml | wc -l` -eq 1 test `grep '<package>' archive/index.xml | wc -l` -eq 1
test `grep '<package>' repo/index.xml | wc -l` -eq 1 test `grep '<package>' repo/index.xml | wc -l` -eq 1
@ -491,9 +494,9 @@ echo 'allow_disabled_algorithms = True' >> config.py
$sed -i.tmp 's,archive_older = [0-9],archive_older = 3,' config.py $sed -i.tmp 's,archive_older = [0-9],archive_older = 3,' config.py
test -d metadata || mkdir metadata test -d metadata || mkdir metadata
cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/ cp $WORKSPACE/tests/metadata/com.politedroid.yml metadata/
echo 'Summary:good test version of urzip' > metadata/info.guardianproject.urzip.txt echo 'Summary: good test version of urzip' > metadata/info.guardianproject.urzip.yml
echo 'Summary:good MD5 sig, disabled algorithm' > metadata/org.bitbucket.tickytacky.mirrormirror.txt echo 'Summary: good MD5 sig, disabled algorithm' > metadata/org.bitbucket.tickytacky.mirrormirror.yml
$sed -i.tmp '/Archive Policy:/d' metadata/*.txt $sed -i.tmp '/ArchivePolicy:/d' metadata/*.yml
test -d repo || mkdir repo test -d repo || mkdir repo
cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk \ cp $WORKSPACE/tests/repo/com.politedroid_[0-9].apk \
$WORKSPACE/tests/org.bitbucket.tickytacky.mirrormirror_[0-9].apk \ $WORKSPACE/tests/org.bitbucket.tickytacky.mirrormirror_[0-9].apk \
@ -636,12 +639,11 @@ REPOROOT=`create_test_dir`
cd $REPOROOT cd $REPOROOT
mkdir repo mkdir repo
mkdir metadata mkdir metadata
echo "License:GPL-2.0-only" >> metadata/fake.txt echo "License: GPL-2.0-only" >> metadata/fake.yml
echo "Summary:Yup still fake" >> metadata/fake.txt echo "Summary: Yup still fake" >> metadata/fake.yml
echo "Categories:Internet" >> metadata/fake.txt echo "Categories: [Internet]" >> metadata/fake.yml
echo "Description:" >> metadata/fake.txt echo "Description: |" >> metadata/fake.yml
echo "this is fake" >> metadata/fake.txt echo " this is fake" >> metadata/fake.yml
echo "." >> metadata/fake.txt
# fake that no JDKs are available # fake that no JDKs are available
echo 'java_paths = {}' > config.py echo 'java_paths = {}' > config.py