--- a/usr/src/lib/install_transfer/test/test_ips.py Tue Jun 19 02:42:18 2012 -0600
+++ b/usr/src/lib/install_transfer/test/test_ips.py Tue Jun 19 12:18:37 2012 -0600
@@ -24,10 +24,15 @@
# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
#
+import logging
+import os
+import shutil
+import tempfile
import unittest
import pkg.client.progress as progress
from solaris_install.engine import InstallEngine
+from solaris_install.logger import InstallLogger
from solaris_install.transfer.info import Args
from solaris_install.transfer.info import Destination
from solaris_install.transfer.info import Facet
@@ -253,7 +258,9 @@
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("IPS transfer")
@@ -276,6 +283,15 @@
self.tr_ips = None
self.engine = None
+ try:
+ shutil.rmtree(os.path.dirname(
+ InstallLogger.DEFAULTFILEHANDLER.baseFilename))
+ except:
+ pass
+
+ logging.Logger.manager.loggerDict = {}
+ InstallLogger.DEFAULTFILEHANDLER = None
+
def test_create(self):
'''Test that the IPS Transfer object is created'''
try: