mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 14:15:28 +00:00
35966308b5
Commit4f4c3b13(v3.3) fixed an issue where performing cleanup of libvirt objects could sometimes lose error messages, by adding code to copy the libvirt error into last_error prior to cleanup paths. However, it caused a regression: on other paths, some errors are now printed twice, if libvirt still remembers in its thread-local storage that an error was set even after virsh cleared last_error. For example: $ virsh -c test:///default snapshot-delete test blah error: Domain snapshot not found: no domain snapshot with matching name 'blah' error: Domain snapshot not found: no domain snapshot with matching name 'blah' Fix things by telling libvirt to discard any thread-local errors at the same time virsh prints an error message (whether or not the libvirt error is the same as what is stored in last_error). Update the virsh-undefine testsuite (partially reverting portions of commitb620bdee, by removing -q, to more easily pinpoint which commands are causing which messages), now that there is only one error message instead of two. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
77 lines
2.1 KiB
Bash
Executable File
77 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
# exercise virsh's "undefine" command
|
|
|
|
# Copyright (C) 2008-2009, 2011 Red Hat, Inc.
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHEXP ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
. "$(dirname $0)/test-lib.sh"
|
|
|
|
if test "$VERBOSE" = yes; then
|
|
set -x
|
|
$abs_top_builddir/tools/virsh --version
|
|
fi
|
|
|
|
fail=0
|
|
|
|
# Attempt to undefine a running domain, by domain name. Every time a new
|
|
# connection is opened to the test driver, it starts life with a new
|
|
# persistent running domain named 'test' with a different uuid, so
|
|
# testing this command requires batch mode use of virsh.
|
|
$abs_top_builddir/tools/virsh -c test:///default \
|
|
'dominfo test; undefine test; dominfo test' > out1 2>&1
|
|
test $? = 0 || fail=1
|
|
sed '/^Persistent/n; /:/d' < out1 > out
|
|
cat <<\EOF > exp || fail=1
|
|
Persistent: yes
|
|
|
|
Domain test has been undefined
|
|
|
|
Persistent: no
|
|
|
|
EOF
|
|
compare exp out || fail=1
|
|
|
|
# A similar diagnostic when specifying a domain ID
|
|
$abs_top_builddir/tools/virsh -c test:///default \
|
|
'dominfo 1; undefine 1; dominfo 1' > out1 2>&1
|
|
test $? = 0 || fail=1
|
|
sed '/^Persistent/n; /:/d' < out1 > out
|
|
cat <<\EOF > exp || fail=1
|
|
Persistent: yes
|
|
|
|
Domain 1 has been undefined
|
|
|
|
Persistent: no
|
|
|
|
EOF
|
|
compare exp out || fail=1
|
|
|
|
# Succeed, now: first shut down, then undefine, both via name.
|
|
$abs_top_builddir/tools/virsh -c test:///default \
|
|
'shutdown test; undefine test; dominfo test' > out 2>&1
|
|
test $? = 1 || fail=1
|
|
cat <<\EOF > expout || fail=1
|
|
Domain test is being shutdown
|
|
|
|
Domain test has been undefined
|
|
|
|
error: failed to get domain 'test'
|
|
|
|
EOF
|
|
compare expout out || fail=1
|
|
|
|
(exit $fail); exit $fail
|