--- a/src/tests/cli/testutils.py	Mon Nov 10 15:58:41 2008 -0800
+++ b/src/tests/cli/testutils.py	Tue Nov 11 14:37:39 2008 -0800
@@ -312,12 +312,20 @@
                 if os.path.exists(self.img_path):
                         shutil.rmtree(self.img_path)
 
-        def pkg(self, command, exit = 0, comment = "", prefix = ""):
-
+        def pkg(self, command, exit=0, comment="", prefix="", su_wrap=None):
+                if su_wrap:
+                        if su_wrap == True:
+                                su_wrap = "noaccess"
+                        su_wrap = "su %s -c '" % su_wrap
+                        su_end = "'"
+                else:
+                        su_wrap = ""
+                        su_end = ""
                 if prefix:
-                        cmdline = "%s;pkg %s" % (prefix, command)
+                        cmdline = "%s;%spkg %s%s" % (prefix, su_wrap, command,
+                            su_end)
                 else:
-                        cmdline = "pkg %s" % command
+                        cmdline = "%spkg %s%s" % (su_wrap, command, su_end)
                 self.debugcmd(cmdline)
 
                 p = subprocess.Popen(cmdline, shell = True,