Merge pull request #1584 from rtfd/remove-project-artifacts-from-all-web

Remove project artifacts from all web servers on project delete

Author: agjohnson

readthedocs/projects/tasks.py

@@ -825,3 +825,16 @@ def clear_htmlzip_artifacts(version):
 
 def clear_html_artifacts(version):
     run_on_app_servers('rm -rf %s' % version.project.rtd_build_path(version=version.slug))
+
+
+@task(queue='web')
+def remove_path_from_web(path):
+    """
+    Remove the given path from the web servers file system.
+    """
+    # Santity check  for spaces in the path since spaces would result in
+    # deleting unpredictable paths with "rm -rf".
+    assert ' ' not in path, "No spaces allowed in path"
+
+    # TODO: We need some proper escaping here for the given path.
+    run_on_app_servers('rm -rf {path}'.format(path=path))

readthedocs/projects/views/private.py

@@ -34,6 +34,7 @@
     RedirectForm, WebHookForm)
 from readthedocs.projects.models import Project, EmailHook, WebHook
 from readthedocs.projects import constants, tasks
+from readthedocs.projects.tasks import remove_path_from_web
 
 
 from readthedocs.projects.signals import project_import
@@ -214,7 +215,8 @@ def project_delete(request, project_slug):
 
     if request.method == 'POST':
         # Remove the repository checkout
-        shutil.rmtree(project.doc_path, ignore_errors=True)
+        remove_path_from_web.delay(path=project.doc_path)
+
         # Delete the project and everything related to it
         project.delete()
         messages.success(request, _('Project deleted'))

readthedocs/rtd_tests/tests/test_project_views.py

@@ -1,7 +1,8 @@
-import re
-
 from django.contrib.auth.models import User
 from django.contrib.messages import constants as message_const
+from django_dynamic_fixture import get
+from django_dynamic_fixture import new
+from mock import patch
 
 from readthedocs.rtd_tests.base import WizardTestCase, MockBuildTestCase
 from readthedocs.projects.models import Project
@@ -185,19 +186,38 @@ def test_import_demo_imported_duplicate(self):
 
 
 class TestPrivateViews(MockBuildTestCase):
-    fixtures = ['test_data', 'eric']
-
     def setUp(self):
+        self.user = new(User, username='eric')
+        self.user.set_password('test')
+        self.user.save()
         self.client.login(username='eric', password='test')
 
     def test_versions_page(self):
+        pip = get(Project, slug='pip', users=[self.user])
+        pip.versions.create(verbose_name='1.0')
+
         response = self.client.get('/projects/pip/versions/')
         self.assertEqual(response.status_code, 200)
 
         # Test if the versions page works with a version that contains a slash.
         # That broke in the past, see issue #1176.
-        pip = Project.objects.get(slug='pip')
         pip.versions.create(verbose_name='1.0/with-slash')
 
         response = self.client.get('/projects/pip/versions/')
         self.assertEqual(response.status_code, 200)
+
+    def test_delete_project(self):
+        project = get(Project, slug='pip', users=[self.user])
+
+        response = self.client.get('/dashboard/pip/delete/')
+        self.assertEqual(response.status_code, 200)
+
+        patcher = patch(
+            'readthedocs.projects.views.private.remove_path_from_web')
+        with patcher as remove_path_from_web:
+            response = self.client.post('/dashboard/pip/delete/')
+            self.assertEqual(response.status_code, 302)
+
+            self.assertFalse(Project.objects.filter(slug='pip').exists())
+            remove_path_from_web.delay.assert_called_with(
+                path=project.doc_path)