--- a/src/tests/cli/t_pkg_image_update.py	Tue Nov 17 17:06:35 2009 -0600
+++ b/src/tests/cli/t_pkg_image_update.py	Wed Nov 18 15:53:48 2009 -0800
@@ -181,15 +181,15 @@
                 self.image_create(durl1, prefix="test1")
 
                 # First, verify that the preferred status of a publisher will
-                # choose which source is used for image-update when two
+                # not affect which source is used for image-update when two
                 # publishers offer the same package and the package publisher
                 # was preferred at the time of install.
                 self.pkg("set-publisher -P -O %s test2" % durl2)
                 self.pkg("install [email protected]")
                 self.pkg("info [email protected] | grep test2")
                 self.pkg("set-publisher -P test1")
-                self.pkg("image-update -v")
-                self.pkg("info [email protected] | grep test1")
+                self.pkg("image-update -v", exit=4)
+                self.pkg("info [email protected] | grep test1", exit=1)
                 self.pkg("uninstall foo")
 
                 # Next, verify that the preferred status of a publisher will
@@ -199,28 +199,11 @@
                 # to install the package.
                 self.pkg("install [email protected]")
                 self.pkg("info [email protected] | grep test2")
-                self.pkg("image-update -v")
+                self.pkg("image-update -v", exit=4)
                 self.pkg("info [email protected] | grep test2")
-                self.pkg("uninstall baz")
-
-                # Next, verify that if two non-preferred publishers offer
-                # the same package, that the publisher it was installed from
-                # will be chosen for an update and the update will succeed. In
-                # addition, its dependencies should be selected from the same
-                # publisher used for the update if that publisher has them and
-                # the remaining dependencies selected from the first available.
-                self.pkg("set-publisher -P -O %s test3" % durl3)
-                self.pkg("install pkg://test1/[email protected]")
-                self.pkg("info [email protected] | grep test1")
-                self.pkg("info [email protected] | grep test1")
-                self.pkg("info [email protected] | grep test2")
-                self.pkg("image-update -v")
-                self.pkg("info [email protected] | grep test1")
-                self.pkg("info [email protected] | grep test1")
-                self.pkg("info [email protected] | grep test1")
 
                 # Finally, cleanup and verify no packages are installed.
-                self.pkg("uninstall -vr corge")
+                self.pkg("uninstall '*'")
                 self.pkg("list", exit=1)