ostree/tests/test-reset-nonlinear.sh

#!/bin/bash
#
# Copyright (C) 2015 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 -euo pipefail

echo "1..1"

. $(dirname $0)/libtest.sh

setup_test_repository "archive"
cd ${test_tmpdir}/files
$OSTREE commit -b testx -s "Another Commit"
cd ${test_tmpdir}
$OSTREE reset test2 testx

echo "ok reset nonlinear"
reset: Don't enforce parent commits First, git doesn't do this, and whatever Linus thinks is right or something. Second specifically to OSTree, it's quite common to not have intermediate commits. If one wants to reset a ref in order to prune data after a deployment, the parentage check will fail. Closes: https://github.com/GNOME/ostree/pull/87 2015-04-08 03:54:37 +03:00			`#!/bin/bash`
			`#`
			`# Copyright (C) 2015 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.`

tests: Use "bash strict mode" I noticed in the static deltas tests, there were some tests that should have been under `-o pipefail` to ensure we properly propagate errors. There were a few places where we were referencing undefined variables. Overall, this is clearly a good idea IMO. 2016-01-27 19:44:10 +03:00			`set -euo pipefail`
reset: Don't enforce parent commits First, git doesn't do this, and whatever Linus thinks is right or something. Second specifically to OSTree, it's quite common to not have intermediate commits. If one wants to reset a ref in order to prune data after a deployment, the parentage check will fail. Closes: https://github.com/GNOME/ostree/pull/87 2015-04-08 03:54:37 +03:00
			`echo "1..1"`

			`. $(dirname $0)/libtest.sh`

tree-wide: Replace archive-z2 with archive In almost all places. There are just a few exceptions; one tricky bit for example is that the repo config must still have `mode=archive-z2`, since `archive` used to mean something else. (We could very likely just get rid of that check, but eh, later). I also added a test that one can still do `ostree repo init --mode=archive-z2`. Closes: #1125 Approved by: jlebon 2017-09-01 23:15:33 +03:00			`setup_test_repository "archive"`
reset: Don't enforce parent commits First, git doesn't do this, and whatever Linus thinks is right or something. Second specifically to OSTree, it's quite common to not have intermediate commits. If one wants to reset a ref in order to prune data after a deployment, the parentage check will fail. Closes: https://github.com/GNOME/ostree/pull/87 2015-04-08 03:54:37 +03:00			`cd ${test_tmpdir}/files`
			`$OSTREE commit -b testx -s "Another Commit"`
			`cd ${test_tmpdir}`
			`$OSTREE reset test2 testx`

			`echo "ok reset nonlinear"`