From c71971090752c070cf76b1647497dfdac90d3fc0 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 19 Sep 2019 15:02:14 +0200 Subject: [PATCH] tests: Some cosmetic fixes for the version check test Closes: #3118 Approved by: alexlarsson --- tests/test-repo.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test-repo.sh b/tests/test-repo.sh index bf194d99..c9f141ed 100644 --- a/tests/test-repo.sh +++ b/tests/test-repo.sh @@ -261,14 +261,14 @@ V=( ${CURRENT_VERSION//./ } ) # Split parts to array make_required_version_app org.test.SameVersion "${V[0]}.${V[1]}.${V[2]}" make_required_version_app org.test.NeedNewerMicro "${V[0]}.${V[1]}.$(expr ${V[2]} + 1)" make_required_version_app org.test.NeedNewerMinor "${V[0]}.$(expr ${V[1]} + 1).${V[2]}" -make_required_version_app org.test.NeedNewerMaster "$(expr ${V[0]} + 1).${V[1]}.${V[2]}" +make_required_version_app org.test.NeedNewerMajor "$(expr ${V[0]} + 1).${V[1]}.${V[2]}" make_required_version_app org.test.NeedOlderMinor "${V[0]}.$(expr ${V[1]} - 1).${V[2]}" make_required_version_app org.test.MultiVersionFallback "${V[0]}.${V[1]}.${V[2]};1.0.0;" make_required_version_app org.test.MultiVersionFallbackFail "${V[0]}.$(expr ${V[1]} + 1).${V[2]};1.0.0;" make_required_version_app org.test.MultiVersionOk "${V[0]}.$(expr ${V[1]} + 1).0;${V[0]}.${V[1]}.${V[2]};" make_required_version_app org.test.MultiVersionNotOk "${V[0]}.$(expr ${V[1]} + 1).0;${V[0]}.${V[1]}.$(expr ${V[2]} + 1);" -update_repo $REPONAME "${COLLECTION_ID}" +update_repo ${FLATPAK} ${U} install -y test-repo org.test.SameVersion ${FLATPAK} ${U} install -y test-repo org.test.NeedOlderMinor @@ -284,7 +284,7 @@ fi assert_file_has_content install-error-log "needs a later flatpak version" if ${FLATPAK} ${U} install -y test-repo org.test.NeedNewerMajor 2> install-error-log; then - assert_not_reached "Should not be able to install with wrong micro version" + assert_not_reached "Should not be able to install with wrong major version" fi assert_file_has_content install-error-log "needs a later flatpak version"