- Fix Tests

geonode/base/utils.py

@@ -44,8 +44,10 @@ def delete_orphaned_thumbs():
         model = filename.split('-')[0]
         uuid = filename.replace(model, '').replace('-thumb.png', '')[1:]
         if ResourceBase.objects.filter(uuid=uuid).count() == 0:
+            print 'Removing orphan thumb %s' % fn
             logger.debug('Removing orphan thumb %s' % fn)
             try:
                 os.remove(fn)
             except OSError:
-                logger.debug('Could not delete file %s' % fn)
+                print 'Could not delete file %s' % fn
+                logger.error('Could not delete file %s' % fn)

geonode/documents/tests.py

@@ -481,6 +481,7 @@ def test_moderated_upload(self):
             _d = Document.objects.get(title=dname)
 
             self.assertTrue(_d.is_published)
+            uuid = _d.uuid
             _d.delete()
 
             from geonode.documents.utils import delete_orphaned_document_files
@@ -489,7 +490,18 @@ def test_moderated_upload(self):
             from geonode.base.utils import delete_orphaned_thumbs
             delete_orphaned_thumbs()
 
-            self.assertFalse(os.path.isfile(input_path))
+            from django.conf import settings
+            documents_path = os.path.join(settings.MEDIA_ROOT, 'documents')
+            fn = os.path.join(documents_path, os.path.basename(input_path))
+            self.assertFalse(os.path.isfile(fn))
+
+            thumbs_path = os.path.join(settings.MEDIA_ROOT, 'thumbs')
+            _cnt = 0
+            for filename in os.listdir(thumbs_path):
+                fn = os.path.join(thumbs_path, filename)
+                if uuid in filename:
+                    _cnt += 1
+            self.assertTrue(_cnt == 0)
 
         with self.settings(ADMIN_MODERATE_UPLOADS=True):
             document_upload_url = reverse('document_upload')

geonode/documents/utils.py

@@ -23,13 +23,16 @@
 
 # Standard Modules
 import os
+import logging
 
 # Django functionality
 from django.conf import settings
 
 # Geonode functionality
 from geonode.documents.models import Document
 
+logger = logging.getLogger(__name__)
+
 
 def delete_orphaned_document_files():
     """
@@ -40,7 +43,9 @@ def delete_orphaned_document_files():
         fn = os.path.join(documents_path, filename)
         if Document.objects.filter(doc_file__contains=filename).count() == 0:
             print 'Removing orphan document %s' % fn
+            logger.debug('Removing orphan document %s' % fn)
             try:
                 os.remove(fn)
             except OSError:
                 print 'Could not delete file %s' % fn
+                logger.error('Could not delete file %s' % fn)