--- a/usr/src/cmd/text-install/test/test_disk_select.py	Fri Jun 29 10:15:59 2012 -0700
+++ b/usr/src/cmd/text-install/test/test_disk_select.py	Fri Jun 29 00:42:35 2012 -0600
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 '''
@@ -47,7 +47,7 @@
 import terminalui
 from terminalui.base_screen import BaseScreen
 from solaris_install.engine.test.engine_test_utils import \
-    get_new_engine_instance
+    get_new_engine_instance, reset_engine
 from solaris_install.target.size import Size
 
 terminalui.init_logging("test")
@@ -56,17 +56,17 @@
 
 class MockCenterWin(object):
     '''Mocks an InnerWindow as used by a MainWindow'''
-    
+
     def add_paragraph(self, *args, **kwargs):
         pass
 
 
 class MockAll(object):
     '''Generic Mock object that 'never' raises an AttributeError'''
-    
+
     def __getattr__(self, name):
         return self
-    
+
     def __call__(self, *args, **kwargs):
         return None
 
@@ -80,31 +80,34 @@
 
 class DiskSelectTest(unittest.TestCase):
     '''Test the DiskScreen'''
-    
+
     def setUp(self):
         self.engine = get_new_engine_instance()
         self.screen = disk_selection.DiskScreen(MockAll(), MockTC())
         self.screen.disk_win = MockAll()
-    
+
+    def tearDown(self):
+        reset_engine()
+
     def test_size_line(self):
         '''Ensure that DiskScreen._size_line is created and is a string after
         calling get_size_line. Also verify that subsequent calls do not modify
         the _size_line
-        
+
         '''
         self.assertTrue(self.screen._size_line is None)
         self.screen.get_size_line()
         self.assertTrue(isinstance(self.screen._size_line, basestring))
-        
+
         obj = object()
         self.screen._size_line = obj
         self.screen.get_size_line()
         self.assertTrue(obj is self.screen._size_line)
-    
+
     def test_determine_size_data(self):
         '''Ensure that recommended_size and minimum_size are accessible after
         a call to determine_size_data(), and that they are numbers'''
-        
+
         self.assertTrue(self.screen._recommended_size is None)
         self.assertTrue(self.screen._minimum_size is None)
         self.screen.determine_size_data()