avoid two test failures induced by today's error-reporting changes

* tests/cpuset: Adjust expected diagnostic to match new behavior.
* tests/undefine: Likewise.

ChangeLog

+Mon Feb 9 16:25:52 +0100 2009 Jim Meyering <meyering@redhat.com>
+
+	avoid two test failures induced by today's error-reporting changes
+	* tests/cpuset: Adjust expected diagnostic to match new behavior.
+	* tests/undefine: Likewise.
+
 Mon Feb  9 14:19:02 GMT 2009 John Levon <john.levon@sun.com>
 
 	* src/virsh.c: rather than verbosely printing every error, save

tests/cpuset

 #!/bin/sh
 # ensure that defining with an invalid vCPU cpuset elicits a diagnostic
 
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008-2009 Free Software Foundation, 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
@@ -36,8 +36,8 @@ sed "s/vcpu>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1
 # Require failure and a diagnostic.
 virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1
 cat <<\EOF > exp || fail=1
-libvir: Domain Config error : failed Xen syscall topology cpuset syntax error
 error: Failed to define domain from xml-invalid
+error: failed Xen syscall topology cpuset syntax error
 
 EOF
 compare exp out || fail=1

tests/undefine

 #!/bin/sh
 # exercise virsh's "undefine" command
 
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008-2009 Free Software Foundation, 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
@@ -29,8 +29,8 @@ fail=0
 virsh -q -c test:///default undefine test > out 2>&1
 test $? = 1 || fail=1
 cat <<\EOF > exp || fail=1
-libvir: Test error : internal error Domain 'test' is still running
 error: Failed to undefine domain test
+error: internal error Domain 'test' is still running
 EOF
 compare exp out || fail=1