From 620157ba12d83b64d2c972ff4e20e634461ad3c8 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 17 Jun 2020 17:22:41 +0200
Subject: [PATCH] tests: Allow specifying app id and app branch for updated
 apps

---
 tests/libtest.sh       | 5 ++++-
 tests/make-test-app.sh | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/libtest.sh b/tests/libtest.sh
index d6cf7e67..acb2095b 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -371,8 +371,11 @@ make_updated_app () {
         COLLECTION_ID=""
     fi
     BRANCH=${3:-master}
+    TEXT=${4:-UPDATED}
+    APP_ID=${5:-""}
+    RUNTIME_BRANCH=${6:-$BRANCH}
 
-    GPGARGS="${GPGARGS:-${FL_GPGARGS}}" $(dirname $0)/make-test-app.sh repos/${REPONAME} "" "${BRANCH}" "${COLLECTION_ID}" ${4:-UPDATED} > /dev/null
+    RUNTIME_BRANCH=$RUNTIME_BRANCH GPGARGS="${GPGARGS:-${FL_GPGARGS}}" $(dirname $0)/make-test-app.sh repos/${REPONAME} "${APP_ID}" "${BRANCH}" "${COLLECTION_ID}" "${TEXT}" > /dev/null
     update_repo $REPONAME "${COLLECTION_ID}"
 }
 
diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
index e51e21a6..612f914f 100755
--- a/tests/make-test-app.sh
+++ b/tests/make-test-app.sh
@@ -20,6 +20,8 @@ if [ x$APP_ID = x ]; then
     APP_ID=org.test.Hello
 fi
 
+RUNTIME_BRANCH=${RUNTIME_BRANCH:-$BRANCH}
+
 EXTRA="${1-}"
 
 ARCH=`flatpak --default-arch`
@@ -28,8 +30,8 @@ ARCH=`flatpak --default-arch`
 cat > ${DIR}/metadata <<EOF
 [Application]
 name=$APP_ID
-runtime=org.test.Platform/$ARCH/$BRANCH
-sdk=org.test.Platform/$ARCH/$BRANCH
+runtime=org.test.Platform/$ARCH/$RUNTIME_BRANCH
+sdk=org.test.Platform/$ARCH/$RUNTIME_BRANCH
 EOF
 
 if [ x${REQUIRED_VERSION-} != x ]; then