--- a/usr/src/lib/install_transfer/test/test_cpio.py Tue Jun 19 02:42:18 2012 -0600
+++ b/usr/src/lib/install_transfer/test/test_cpio.py Tue Jun 19 12:18:37 2012 -0600
@@ -44,8 +44,9 @@
import logging
import os
+import shutil
+import tempfile
import unittest
-import shutil
class TestCPIOFunctions(unittest.TestCase):
@@ -60,7 +61,10 @@
def setUp(self):
InstallEngine._instance = None
- InstallEngine()
+
+ default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = default_log_dir + "/install_log"
+ InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
self.soft_node = Software("CPIO_Transfer", "CPIO")
@@ -93,6 +97,15 @@
InstallEngine._instance = None
TEST_CONTENTS_LIST = []
+ try:
+ shutil.rmtree(os.path.dirname(
+ InstallLogger.DEFAULTFILEHANDLER.baseFilename))
+ except:
+ pass
+
+ logging.Logger.manager.loggerDict = {}
+ InstallLogger.DEFAULTFILEHANDLER = None
+
def test_software_type(self):
self.assertTrue(self.soft_node.tran_type == "CPIO")