equal
deleted
inserted
replaced
144 InstallLogger.DEFAULTFILEHANDLER = None |
144 InstallLogger.DEFAULTFILEHANDLER = None |
145 logging.Logger.manager.loggerDict = {} |
145 logging.Logger.manager.loggerDict = {} |
146 logging.setLoggerClass(logging.Logger) |
146 logging.setLoggerClass(logging.Logger) |
147 logging._defaultFormatter = logging.Formatter() |
147 logging._defaultFormatter = logging.Formatter() |
148 |
148 |
|
149 try: |
|
150 shutil.rmtree(self.log_tmp_dir) |
|
151 except: |
|
152 # File doesn't exist |
|
153 pass |
|
154 |
149 def test_no_default_logfile(self): |
155 def test_no_default_logfile(self): |
150 '''Test that the logger does not fail with no default log''' |
156 '''Test that the logger does not fail with no default log''' |
151 logging.setLoggerClass(InstallLogger) |
157 logging.setLoggerClass(InstallLogger) |
152 LOGGER = InstallLogger.manager.getLogger(INSTALL_LOGGER_NAME) |
158 LOGGER = InstallLogger.manager.getLogger(INSTALL_LOGGER_NAME) |
153 self.failIf(not LOGGER.DEFAULTFILEHANDLER == None) |
159 self.failIf(not LOGGER.DEFAULTFILEHANDLER == None) |
156 '''Test that logging can be set up a user create FileHandler''' |
162 '''Test that logging can be set up a user create FileHandler''' |
157 logging.setLoggerClass(InstallLogger) |
163 logging.setLoggerClass(InstallLogger) |
158 LOGGER = InstallLogger.manager.getLogger(INSTALL_LOGGER_NAME) |
164 LOGGER = InstallLogger.manager.getLogger(INSTALL_LOGGER_NAME) |
159 self.log_tmp_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_") |
165 self.log_tmp_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_") |
160 self.logfile = os.path.join(self.log_tmp_dir, TEST_LOG) |
166 self.logfile = os.path.join(self.log_tmp_dir, TEST_LOG) |
161 |
|
162 fh = logging.FileHandler(self.logfile) |
167 fh = logging.FileHandler(self.logfile) |
163 LOGGER.addHandler(fh) |
168 LOGGER.addHandler(fh) |
164 LOGGER.info('This is from the logger') |
169 LOGGER.info('This is from the logger') |
165 logtext = open(self.logfile).read() |
170 logtext = open(self.logfile).read() |
166 logsearch = "This is from the logger" |
171 logsearch = "This is from the logger" |
175 def setUp(self): |
180 def setUp(self): |
176 |
181 |
177 self.log_tmp_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_") |
182 self.log_tmp_dir = tempfile.mkdtemp(dir="/tmp", prefix="logging_") |
178 self.logfile = os.path.join(self.log_tmp_dir, TEST_LOG) |
183 self.logfile = os.path.join(self.log_tmp_dir, TEST_LOG) |
179 self.pid = str(os.getpid()) |
184 self.pid = str(os.getpid()) |
180 self.eng = get_new_engine_instance(default_log=self.logfile) |
185 self.eng = TestInstallEngine(self.logfile) |
181 self.test_logger = logging.getLogger(INSTALL_LOGGER_NAME) |
186 self.test_logger = logging.getLogger(INSTALL_LOGGER_NAME) |
182 self.list = [] |
187 self.list = [] |
183 |
188 |
184 def tearDown(self): |
189 def tearDown(self): |
185 self.eng = None |
190 self.eng = None |
|
191 TestInstallEngine._instance = None |
186 InstallLogger.DEFAULTFILEHANDLER = None |
192 InstallLogger.DEFAULTFILEHANDLER = None |
187 logging.Logger.manager.loggerDict = {} |
193 logging.Logger.manager.loggerDict = {} |
188 logging.setLoggerClass(logging.Logger) |
194 logging.setLoggerClass(logging.Logger) |
189 self.test_logger.name = None |
195 self.test_logger.name = None |
190 logging._defaultFormatter = logging.Formatter() |
196 logging._defaultFormatter = logging.Formatter() |