diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2014-10-21 21:08:15 +0200 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-10-21 16:18:30 -0400 |
| commit | c4b7717076f8d3c0d89880eaefa9a8dd827d6a0e (patch) | |
| tree | f11e0f67dab3ff68661d16bc2422c0b5e4a1b6c0 | |
| parent | 22a82341b10299f70903ad7a49fafcf3446a248f (diff) | |
| download | ostree-c4b7717076f8d3c0d89880eaefa9a8dd827d6a0e.tar.gz | |
tests: test-admin-deploy-switch doesn't use deprecated "current" symlink
commit dfeb27eca55d923c57735e491e438ae54f8cc201 removed it, so change
the test to not use it.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rwxr-xr-x[-rw-r--r--] | tests/test-admin-deploy-switch.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test-admin-deploy-switch.sh b/tests/test-admin-deploy-switch.sh index 0516e5c2..03ec9ddc 100644..100755 --- a/tests/test-admin-deploy-switch.sh +++ b/tests/test-admin-deploy-switch.sh @@ -32,14 +32,16 @@ echo "1..3" ostree --repo=sysroot/ostree/repo remote add --set=gpg-verify=false testos file://$(pwd)/testos-repo 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 -assert_not_has_file sysroot/ostree/deploy/testos/current/usr/include/foo.h +newrev=$(ostree --repo=sysroot/ostree/repo rev-parse testos:testos/buildmaster/x86_64-runtime) +assert_not_has_file sysroot/ostree/deploy/testos/deploy/$newrev.0/usr/include/foo.h if ostree admin --sysroot=sysroot switch --os=testos testos/buildmaster/x86_64-runtime; then assert_not_reached "Switch to same ref unexpectedly succeeded" fi echo "ok switch expected error" ostree admin --sysroot=sysroot switch --os=testos testos/buildmaster/x86_64-devel -assert_file_has_content sysroot/ostree/deploy/testos/current/usr/include/foo.h 'header' +newrev=$(ostree --repo=sysroot/ostree/repo rev-parse testos:testos/buildmaster/x86_64-devel) +assert_file_has_content sysroot/ostree/deploy/testos/deploy/$newrev.0/usr/include/foo.h 'header' echo "ok switch" |