From 4b7c4335e14e69e936acd363368e306f99695c29 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 30 Jun 2016 16:02:17 -0400 Subject: [PATCH] Improve TempfileCheckMixin. --- mayan/apps/common/tests/mixins.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/mayan/apps/common/tests/mixins.py b/mayan/apps/common/tests/mixins.py index 844585ecef..9861b9e278 100644 --- a/mayan/apps/common/tests/mixins.py +++ b/mayan/apps/common/tests/mixins.py @@ -8,20 +8,22 @@ from ..settings import setting_temporary_directory class TempfileCheckMixin(object): - def _get_temporary_entries_count(self): - return len(os.listdir(setting_temporary_directory.value)) + def _get_temporary_entries(self): + return os.listdir(setting_temporary_directory.value) def setUp(self): super(TempfileCheckMixin, self).setUp() - self._temporary_items = self._get_temporary_entries_count() + self._temporary_entries = self._get_temporary_entries() def tearDown(self): - self.assertEqual( - self._temporary_items, self._get_temporary_entries_count(), - msg='Orphan temporary file. The number of temporary file and ' - 'directories at the start and at the end of the test are not the ' - 'same.' - ) + for temporary_entry in self._get_temporary_entries(): + self.assertFalse( + temporary_entry not in self._temporary_entries, + msg='Orphan temporary file. The number of temporary file and ' + 'directories at the start and at the end of the test are not the ' + 'same.' + ) + super(TempfileCheckMixin, self).tearDown() @@ -41,7 +43,8 @@ class OpenFileCheckMixin(object): def tearDown(self): if not getattr(self, '_skip_file_descriptor_test', False): for new_open_file in self._get_open_files(): - self.assertFalse(new_open_file not in self._open_files, + self.assertFalse( + new_open_file not in self._open_files, msg='File descriptor leak. The number of file descriptors ' 'at the start and at the end of the test are not the same.' )