From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 4 Apr 2014 02:17:52 +0000 (-0400)
Subject: add test case were init generates a keystore and uses it
X-Git-Tag: 0.2~141^2~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=faf0c4381f632527e79f3c6a35333e0986cd1469;p=fdroidserver.git

add test case were init generates a keystore and uses it
---

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 5c5c31d0..dbe62eed 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -3,6 +3,18 @@
 set -e
 set -x
 
+copy_apks_into_repo() {
+    for f in `ls -1 ../../*/bin/*.apk`; do
+        name=$(basename $(dirname `dirname $f`))
+        echo "name $name"
+        apk=${name}_`basename $f`
+        echo "apk $apk"
+        cp $f $1/repo/$apk
+    done
+    # delete any 'unaligned' duplicates
+    rm -f $1/repo/*unaligned*.apk
+}
+
 if [ -z $WORKSPACE ]; then
     WORKSPACE=`dirname $(pwd)`
     echo "Setting Workspace to $WORKSPACE"
@@ -19,16 +31,21 @@ fi
 REPOROOT=`mktemp --directory --tmpdir=$WORKSPACE`
 cd $REPOROOT
 $fdroid init
-for f in `ls -1 ../../*/bin/*.apk`; do
-    name=$(basename $(dirname `dirname $f`))
-    echo "name $name"
-    apk=${name}_`basename $f`
-    echo "apk $apk"
-    cp $f $REPOROOT/repo/$apk
-done
-# delete any 'unaligned' duplicates
-rm -f $REPOROOT/repo/*unaligned*.apk
+copy_apks_into_repo $REPOROOT
+$fdroid update -c
+$fdroid update
 
 
+#------------------------------------------------------------------------------#
+# setup a new repo from scratch and generate a keystore
+
+REPOROOT=`mktemp --directory --tmpdir=$WORKSPACE`
+KEYSTORE=$REPOROOT/keystore.jks
+cd $REPOROOT
+$fdroid init --keystore $KEYSTORE
+test -e $KEYSTORE
+copy_apks_into_repo $REPOROOT
 $fdroid update -c
 $fdroid update
+test -e repo/index.xml
+test -e repo/index.jar