Merge branch 'newcomers' into 'master'

allow starting without config.py

See merge request fdroid/fdroidserver!335
This commit is contained in:
Hans-Christoph Steiner 2017-09-16 08:07:56 +00:00
commit acac15f74d
3 changed files with 7 additions and 8 deletions

View file

@ -185,7 +185,6 @@ echo_header 'copy git import and run `fdroid scanner` on it'
REPOROOT=`create_test_dir`
cd $REPOROOT
touch config.py
cp $WORKSPACE/examples/fdroid-icon.png $REPOROOT/
mkdir metadata
echo "Auto Name:Just A Test" > metadata/org.fdroid.ci.test.app.txt
@ -526,7 +525,6 @@ echo_header "test metadata checks"
REPOROOT=`create_test_dir`
cd $REPOROOT
touch config.py
mkdir repo
cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/
@ -828,7 +826,6 @@ echo_header "setup a new repo manually and generate a keystore"
REPOROOT=`create_test_dir`
KEYSTORE=$REPOROOT/keystore.jks
cd $REPOROOT
touch config.py
cp $WORKSPACE/examples/fdroid-icon.png $REPOROOT/
! test -e $KEYSTORE
set +e
@ -895,7 +892,6 @@ echo_header "setup a new repo with no keystore, add APK, and update"
REPOROOT=`create_test_dir`
KEYSTORE=$REPOROOT/keystore.jks
cd $REPOROOT
touch config.py
touch fdroid-icon.png
mkdir repo
cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/