Project updated when subproject modified

readthedocs/projects/models.py

@@ -326,8 +326,26 @@ def save(self, *args, **kwargs):  # pylint: disable=arguments-differ
             log.exception('failed to sync supported versions')
         try:
             if not first_save:
-                broadcast(type='app', task=tasks.symlink_project,
-                          args=[self.pk],)
+                log.info(
+                    'Re-symlinking project and subprojects: project=%s',
+                    self.slug,
+                )
+                broadcast(
+                    type='app',
+                    task=tasks.symlink_project,
+                    args=[self.pk],
+                )
+                log.info(
+                    'Re-symlinking superprojects: project=%s',
+                    self.slug,
+                )
+                for superproject in self.superprojects.all():
+                    broadcast(
+                        type='app',
+                        task=tasks.symlink_project,
+                        args=[superproject.pk],
+                    )
+
         except Exception:
             log.exception('failed to symlink project')
         try:

readthedocs/rtd_tests/tests/test_project_symlinks.py

@@ -5,16 +5,16 @@
 import os
 import shutil
 import tempfile
-import collections
-from functools import wraps
 
 import mock
 from django.conf import settings
+from django.core.urlresolvers import reverse
 from django.test import TestCase, override_settings
 from django_dynamic_fixture import get
 
 from readthedocs.builds.models import Version
 from readthedocs.projects.models import Project, Domain
+from readthedocs.projects.tasks import symlink_project
 from readthedocs.core.symlink import PublicSymlink, PrivateSymlink
 
 
@@ -908,3 +908,155 @@ def test_symlink_no_error(self):
             self.symlink.run()
         except:
             self.fail('Symlink run raised an exception on unicode slug')
+
+
+@override_settings()
+class TestPublicPrivateSymlink(TempSiterootCase, TestCase):
+
+    def setUp(self):
+        super(TestPublicPrivateSymlink, self).setUp()
+        from django.contrib.auth.models import User
+
+        self.user = get(User)
+        self.project = get(
+            Project, name='project', slug='project', privacy_level='public',
+            users=[self.user], main_language_project=None)
+        self.project.versions.update(privacy_level='public')
+        self.project.save()
+
+        self.subproject = get(
+            Project, name='subproject', slug='subproject', privacy_level='public',
+            users=[self.user], main_language_project=None)
+        self.subproject.versions.update(privacy_level='public')
+        self.subproject.save()
+
+    def test_change_subproject_privacy(self):
+        """
+        Change subproject's ``privacy_level`` creates proper symlinks.
+
+        When the ``privacy_level`` changes in the subprojects, we need to
+        re-symlink the superproject also to keep in sync its symlink under the
+        private/public roots.
+        """
+        filesystem_before = {
+            'private_cname_project': {},
+            'private_cname_root': {},
+            'private_web_root': {
+                'project': {
+                    'en': {},
+                },
+                'subproject': {
+                    'en': {},
+                },
+            },
+            'public_cname_project': {},
+            'public_cname_root': {},
+            'public_web_root': {
+                'project': {
+                    'en': {
+                        'latest': {
+                            'type': 'link',
+                            'target': 'user_builds/project/rtd-builds/latest',
+                        },
+                    },
+                    'projects': {
+                        'subproject': {
+                            'type': 'link',
+                            'target': 'public_web_root/subproject',
+                        },
+                    },
+                },
+                'subproject': {
+                    'en': {
+                        'latest': {
+                            'type': 'link',
+                            'target': 'user_builds/subproject/rtd-builds/latest',
+                        },
+                    },
+                },
+            },
+        }
+
+        filesystem_after = {
+            'private_cname_project': {},
+            'private_cname_root': {},
+            'private_web_root': {
+                'project': {
+                    'en': {},
+                    'projects': {
+                        'subproject': {
+                            'type': 'link',
+                            'target': 'private_web_root/subproject',
+                        },
+                    },
+                },
+                'subproject': {
+                    'en': {
+                        'latest': {
+                            'type': 'link',
+                            'target': 'user_builds/subproject/rtd-builds/latest',
+                        },
+                    },
+                },
+            },
+            'public_cname_project': {},
+            'public_cname_root': {},
+            'public_web_root': {
+                'project': {
+                    'en': {
+                        'latest': {
+                            'type': 'link',
+                            'target': 'user_builds/project/rtd-builds/latest',
+                        },
+                    },
+                    'projects': {},
+                },
+                'subproject': {
+                    'en': {},
+                },
+            },
+        }
+
+        self.assertEqual(self.project.subprojects.all().count(), 0)
+        self.assertEqual(self.subproject.superprojects.all().count(), 0)
+        self.project.add_subproject(self.subproject)
+        self.assertEqual(self.project.subprojects.all().count(), 1)
+        self.assertEqual(self.subproject.superprojects.all().count(), 1)
+
+        self.assertTrue(self.project.versions.first().active)
+        self.assertTrue(self.subproject.versions.first().active)
+        symlink_project(self.project.pk)
+
+        self.assertFilesystem(filesystem_before)
+
+        self.client.force_login(self.user)
+        self.client.post(
+            reverse('project_version_detail',
+                    kwargs={
+                        'project_slug': self.subproject.slug,
+                        'version_slug': self.subproject.versions.first().slug,
+                    }),
+            data={'privacy_level': 'private', 'active': True},
+        )
+
+        self.assertEqual(self.subproject.versions.first().privacy_level, 'private')
+        self.assertTrue(self.subproject.versions.first().active)
+
+        self.client.post(
+            reverse('projects_advanced',
+                    kwargs={
+                        'project_slug': self.subproject.slug,
+                    }),
+            data={
+                # Required defaults
+                'python_interpreter': 'python',
+                'default_version': 'latest',
+
+                'privacy_level': 'private',
+            },
+        )
+
+        self.assertTrue(self.subproject.versions.first().active)
+        self.subproject.refresh_from_db()
+        self.assertEqual(self.subproject.privacy_level, 'private')
+        self.assertFilesystem(filesystem_after)

requirements/testing.txt

@@ -9,3 +9,4 @@ Mercurial==4.4.2
 
 # local debugging tools
 pdbpp
+datadiff