7179890 lib/install_ict/test leaves /tmp/ict_test* behind and forget to clean up.
7179900 lib/install_transfer leaves /tmp/logging* behind after running tests.
--- a/usr/src/lib/install_ict/test/test_create_snapshot.py Mon Jul 23 09:34:40 2012 -0700
+++ b/usr/src/lib/install_ict/test/test_create_snapshot.py Mon Jul 23 12:12:10 2012 -0600
@@ -21,7 +21,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
'''test_create_snapshot
@@ -31,6 +31,7 @@
import os
import tempfile
import unittest
+import shutil
from common_create_simple_doc import CreateSimpleDataObjectCache
from solaris_install.ict.create_snapshot import CreateSnapshot
@@ -56,6 +57,8 @@
reset_engine()
self.simple.doc = None
+ shutil.rmtree(self.test_target, ignore_errors=True)
+
def test_default_snapshot_name(self):
'''Test that the default snapshot name is install'''
--- a/usr/src/lib/install_ict/test/test_transfer_files.py Mon Jul 23 09:34:40 2012 -0700
+++ b/usr/src/lib/install_ict/test/test_transfer_files.py Mon Jul 23 12:12:10 2012 -0600
@@ -21,7 +21,7 @@
#
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
'''test_transfer_files
@@ -31,6 +31,7 @@
import os
import tempfile
import unittest
+import shutil
from common_create_simple_doc import CreateSimpleDataObjectCache
from solaris_install.data_object.data_dict import DataObjectDict
@@ -72,6 +73,8 @@
self.dod = None
self.trans_dict = {}
+ shutil.rmtree(self.test_target, ignore_errors=True)
+
def test_transfer_files(self):
'''Test transferring logs'''
self.dod = DataObjectDict("TFS", self.trans_dict, generate_xml=True)
--- a/usr/src/lib/install_transfer/test/test_cpio.py Mon Jul 23 09:34:40 2012 -0700
+++ b/usr/src/lib/install_transfer/test/test_cpio.py Mon Jul 23 12:12:10 2012 -0600
@@ -62,8 +62,8 @@
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -97,11 +97,7 @@
InstallEngine._instance = None
TEST_CONTENTS_LIST = []
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None
--- a/usr/src/lib/install_transfer/test/test_info.py Mon Jul 23 09:34:40 2012 -0700
+++ b/usr/src/lib/install_transfer/test/test_info.py Mon Jul 23 12:12:10 2012 -0600
@@ -52,8 +52,8 @@
class TestCPIOInfoFunctions(unittest.TestCase):
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -64,11 +64,7 @@
self.engine = None
self.doc = None
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None
@@ -301,8 +297,8 @@
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -313,11 +309,7 @@
self.engine = None
self.doc = None
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None
@@ -760,8 +752,8 @@
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -772,11 +764,7 @@
self.engine = None
self.doc = None
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None
@@ -803,8 +791,8 @@
class TestSVR4InfoFunctions(unittest.TestCase):
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -815,11 +803,7 @@
self.engine = None
self.doc = None
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None
--- a/usr/src/lib/install_transfer/test/test_ips.py Mon Jul 23 09:34:40 2012 -0700
+++ b/usr/src/lib/install_transfer/test/test_ips.py Mon Jul 23 12:12:10 2012 -0600
@@ -258,8 +258,8 @@
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -283,11 +283,7 @@
self.tr_ips = None
self.engine = None
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None
--- a/usr/src/lib/install_transfer/test/test_misc_transfer.py Mon Jul 23 09:34:40 2012 -0700
+++ b/usr/src/lib/install_transfer/test/test_misc_transfer.py Mon Jul 23 12:12:10 2012 -0600
@@ -40,8 +40,8 @@
class TestCreateCheckpoint(unittest.TestCase):
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -52,11 +52,7 @@
self.engine = None
self.doc = None
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None
--- a/usr/src/lib/install_transfer/test/test_p5i.py Mon Jul 23 09:34:40 2012 -0700
+++ b/usr/src/lib/install_transfer/test/test_p5i.py Mon Jul 23 12:12:10 2012 -0600
@@ -58,8 +58,8 @@
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -74,11 +74,8 @@
def tearDown(self):
self.engine.data_object_cache.clear()
InstallEngine._instance = None
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None
--- a/usr/src/lib/install_transfer/test/test_svr4.py Mon Jul 23 09:34:40 2012 -0700
+++ b/usr/src/lib/install_transfer/test/test_svr4.py Mon Jul 23 12:12:10 2012 -0600
@@ -53,8 +53,8 @@
def setUp(self):
InstallEngine._instance = None
- default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
- default_log = default_log_dir + "/install_log"
+ self.default_log_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_")
+ default_log = self.default_log_dir + "/install_log"
InstallEngine(default_log)
self.engine = InstallEngine.get_instance()
self.doc = self.engine.data_object_cache.volatile
@@ -73,11 +73,8 @@
self.engine.data_object_cache.clear()
self.doc = None
self.engine = None
- try:
- shutil.rmtree(os.path.dirname(
- InstallLogger.DEFAULTFILEHANDLER.baseFilename))
- except:
- pass
+
+ shutil.rmtree(self.default_log_dir, ignore_errors=True)
logging.Logger.manager.loggerDict = {}
InstallLogger.DEFAULTFILEHANDLER = None