curtin

Merge lp:~raharper/curtin/silence_teardown_logger into lp:~curtin-dev/curtin/trunk

  1. silence_teardown_logger
  2. Merge into trunk
Proposed by Ryan Harper
Status: Merged
Merged at revision: 299
Proposed branch: lp:~raharper/curtin/silence_teardown_logger
Merge into: lp:~curtin-dev/curtin/trunk
Diff against target: 19 lines (+1/-1)
1 file modified
tests/vmtests/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~raharper/curtin/silence_teardown_logger
Reviewer Review Type Date Requested Status
Scott Moser Pending
Review via email: mp+277575@code.launchpad.net

Description of the change

Move logger call back to tearDownClass so we don't get error when __del__ method is called.

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

I like that one, better than my thought on just dropping the logger.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/vmtests/__init__.py'
2--- tests/vmtests/__init__.py 2015-11-13 20:04:48 +0000
3+++ tests/vmtests/__init__.py 2015-11-16 14:51:15 +0000
4@@ -188,7 +188,6 @@
5 def remove_tmpdir(self):
6 # remove tempdir
7 if os.path.exists(self.tmpdir):
8- logger.debug('Removing tmpdir: {}'.format(self.tmpdir))
9 shutil.rmtree(self.tmpdir)
10
11 def __del__(self):
12@@ -347,6 +346,7 @@
13 @classmethod
14 def tearDownClass(self):
15 if not get_env_var_bool('CURTIN_VMTEST_KEEP_DATA', False):
16+ logger.debug('Removing tmpdir: {}'.format(self.td.tmpdir))
17 self.td.remove_tmpdir()
18
19 @classmethod

Subscribers

People subscribed via source and target branches