Merge remote-tracking branch 'origin/master' into feature/multi-tenant

HISTORY.rst

@@ -1,4 +1,10 @@
+2.1.4 (2016-XX-XX)
+==================
+- Add missing link to the 2.1.3 release notes in the index file.
+- Improve TempfileCheckMixin.
+
 2.1.3 (2016-06-29)
+==================
 - Add help message when initialsetup migration phase fails. Relates to GitLab issue #296.
 - Start using self.setdout instead of print as per documentation.
 - Fix GitLab issue #295, "When editing a user the top bar jumps to the name of the user".

docs/releases/index.rst

@@ -22,6 +22,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   2.1.3
    2.1.2
    2.1.1
    2.1

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.'
                 )