--- a/usr/src/cmd/system-config/test/test_sysconfig.py	Tue Jun 26 16:03:19 2012 -0700
+++ b/usr/src/cmd/system-config/test/test_sysconfig.py	Tue Jun 26 05:19:07 2012 -0600
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 '''
@@ -46,13 +46,9 @@
     def test_parse_options_no_flags(self):
         '''parse_options() returns proper default options'''
         (options, sub_cmd) = sysconfig._parse_options(["create-profile"])
-        if sysconfig._in_rozr_zone():
-            self.assertEqual(options.logname,
-            os.path.join("/system/volatile",
-                         os.path.basename(sysconfig.DEFAULT_LOG_LOC)))
-        else:
-            self.assertEqual(options.logname, sysconfig.DEFAULT_LOG_LOC)
+	test_default_log = sysconfig.DEFAULT_LOG_LOC + "." + str(os.getpid())
 
+        self.assertEqual(options.logname, test_default_log)
         self.assertEqual(options.log_level,
                          getattr(logging, sysconfig.DEFAULT_LOG_LEVEL.upper()))
         self.assertFalse(options.force_bw)
@@ -63,10 +59,12 @@
         (options, sub_cmd) = sysconfig._parse_options(["create-profile", "-l",
                                                        "/foo/log.txt", "-b",
                                                        "-o", "/foo/sc.xml"])
+	test_logname = "/foo/log.txt" + "." + str(os.getpid())
         if sysconfig._in_rozr_zone():
-            self.assertEqual(options.logname, "/system/volatile/log.txt")
+            self.assertEqual(options.logname,
+	        "/system/volatile/log.txt" + "." + str(os.getpid()))
         else:
-            self.assertEqual(options.logname, "/foo/log.txt")
+            self.assertEqual(options.logname, test_logname)
 
         self.assertEqual(options.profile, "/foo/sc.xml")
         self.assertTrue(options.force_bw)