4ea37a9aa3
The assert[_not]_file_has_content functions used grep to check the pattern against the content. This meant that the '.' characters are interpreted as "any char". Yesterday, the date was 20150910 and thus the otheros' tree's version was labelled as such. This date also happens to match the 1.0.10 pattern, and thus caused the test to fail. This patch makes sure this doesn't happen again by escaping all the dots to make them literal.
56 lines
2.0 KiB
Bash
Executable File
56 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright (C) 2014 Colin Walters <walters@verbum.org>
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with this library; if not, write to the
|
|
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
# Boston, MA 02111-1307, USA.
|
|
|
|
set -e
|
|
|
|
. $(dirname $0)/libtest.sh
|
|
|
|
check_root_test
|
|
|
|
echo "1..1"
|
|
|
|
setup_os_repository "archive-z2" "syslinux"
|
|
|
|
echo "ok setup"
|
|
|
|
# Note: Daemon already knows what sysroot to use, so avoid passing
|
|
# --sysroot=sysroot to rpm-ostree commands as it will result
|
|
# in a warning message.
|
|
|
|
# This initial deployment gets kicked off with some kernel arguments
|
|
ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime
|
|
ostree --repo=sysroot/ostree/repo pull testos:testos/buildmaster/x86_64-runtime
|
|
ostree admin --sysroot=sysroot deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
|
|
|
|
rpm-ostree status | tee OUTPUT-status.txt
|
|
|
|
assert_file_has_content OUTPUT-status.txt '1\.0\.10'
|
|
|
|
os_repository_new_commit
|
|
rpm-ostree upgrade --os=testos
|
|
|
|
ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false otheros file://$(pwd)/testos-repo testos/buildmaster/x86_64-runtime
|
|
rpm-ostree rebase --os=testos otheros:
|
|
|
|
rpm-ostree status | tee OUTPUT-status.txt
|
|
|
|
assert_not_file_has_content OUTPUT-status.txt '1\.0\.10'
|
|
version=$(date "+%Y%m%d\.0")
|
|
assert_file_has_content OUTPUT-status.txt $version
|