--- a/usr/src/cmd/js2ai/modules/conv.py	Tue Jun 26 05:19:07 2012 -0600
+++ b/usr/src/cmd/js2ai/modules/conv.py	Thu Jun 28 11:30:49 2012 -0700
@@ -987,7 +987,7 @@
             except Exception, msg:
                 self.__gen_err(LVL_CONVERSION,
                                _("package name translation failed for "
-                                 "'%(packge)s': %(message)s") % \
+                                 "'%(package)s': %(message)s") % \
                                  {"package": package, \
                                   "message": msg})
             if pkg_name != None:

--- a/usr/src/cmd/js2ai/modules/test/test_suite.py	Tue Jun 26 05:19:07 2012 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-import unittest
-import test_js2ai
-import test_conv
-import test_common
-import test_conv_sysidcfg
-
-
-def test_suite():
-    """ Runs all tests in the various test files"""
-    test_loader = unittest.TestLoader()
-
-    suite = test_loader.loadTestsFromModule(test_js2ai)
-    suite.addTests(test_loader.loadTestsFromModule(test_conv))
-    suite.addTests(test_loader.loadTestsFromModule(test_conv_sysidcfg))
-    suite.addTests(test_loader.loadTestsFromModule(test_common))
-    runner = unittest.TextTestRunner(verbosity=2)
-    runner.run(suite)
-
-if __name__ == "__main__":
-    test_suite()

--- a/usr/src/tools/tests/tests.nose	Tue Jun 26 05:19:07 2012 -0600
+++ b/usr/src/tools/tests/tests.nose	Thu Jun 28 11:30:49 2012 -0700
@@ -30,4 +30,4 @@
 # the files in that directory should begin with "test_". Files
 # containing in-line doc-tests should be added explicitly.
 
-tests=lib/install_common/test/,lib/liberrsvc_pymod/test/,cmd/ai-webserver/test/,cmd/text-install/test/,cmd/installadm/test/,cmd/installadm/installadm_common.py,lib/install_utils/test/,lib/install_logging_pymod/test,lib/install_doc/test,lib/install_engine/test,lib/install_manifest/test/,lib/install_transfer/test,cmd/distro_const/checkpoints/test,cmd/js2ai/modules/test/test_suite.py,lib/terminalui/test,cmd/system-config/profile/test/,cmd/system-config/test/,lib/install_manifest_input/test,lib/install_target/test/,lib/install_ict/test,lib/install_boot/test,lib/netif/test
+tests=lib/install_common/test/,lib/liberrsvc_pymod/test/,cmd/ai-webserver/test/,cmd/text-install/test/,cmd/installadm/test/,cmd/installadm/installadm_common.py,lib/install_utils/test/,lib/install_logging_pymod/test,lib/install_doc/test,lib/install_engine/test,lib/install_manifest/test/,lib/install_transfer/test,cmd/distro_const/checkpoints/test,cmd/js2ai/modules/test,lib/terminalui/test,cmd/system-config/profile/test/,cmd/system-config/test/,lib/install_manifest_input/test,lib/install_target/test/,lib/install_ict/test,lib/install_boot/test,lib/netif/test