diff --git a/tests/cli-install/test.sh b/tests/cli-install/test.sh index b33cc35..d873add 100755 --- a/tests/cli-install/test.sh +++ b/tests/cli-install/test.sh @@ -34,7 +34,7 @@ rlJournalStart # occ should # - successfully set up Nextcloud # - report that Nextcloud is installed afterwards - rlRun -s "sudo -u apache php occ maintenance:install --data-dir=$datadir --admin-pass=admin" 0 "Run 'occ maintenance:install'" + rlRun -s "sudo -u apache ./occ maintenance:install --data-dir=$datadir --admin-pass=admin" 0 "Run 'occ maintenance:install'" rlAssertGrep "successfully installed" "$rlRun_LOG" rlRun -s "sudo -u apache php occ status" 0 "Check install status" rlAssertGrep "installed: true" "$rlRun_LOG" diff --git a/tests/occ/test.sh b/tests/occ/test.sh index 3a80a69..06d6eda 100755 --- a/tests/occ/test.sh +++ b/tests/occ/test.sh @@ -6,8 +6,6 @@ # can be used to test correct dependencies # installation should be done via packages: in .fmf file PACKAGES=${PACKAGES:-"nextcloud"} -# We want to fail the test if no version is passed -VERSION=${VERSION:-"MISSINGVER"} installdir="/usr/share/nextcloud" datadir="/var/lib/nextcloud/data" @@ -31,8 +29,8 @@ rlJournalStart # - work when invoked as ./occ # - return the correct version string rlLog "Testing basic occ functionality" - rlRun -s "sudo -u apache php occ status" 0 "Run 'occ status'" - rlAssertGrep "versionstring: $VERSION" "$rlRun_LOG" + rlRun -s "sudo -u apache ./occ status" 0 "Run 'occ status'" + rlAssertGrep "versionstring: [0-9.]+" "$rlRun_LOG" -E rlPhaseEnd # cleanup