0.13.x (plus #3514) into central-develop

kalite/distributed/templates/distributed/homepage.html

@@ -15,8 +15,6 @@
     <!-- import handlebars templates here -->
     <script src="{% url 'handlebars_templates' module_name="playlists" %}"></script>
     <script type="text/javascript" src="{% static 'js/playlist/models.js' %}"></script>
-    <script type="text/javascript" src="{% static 'js/jquery.dotdotdot.min.js' %}"></script>
-    <script type="text/javascript" src="{% static 'js/distributed/homepage_playlists.js' %}"></script>
     {% if settings.AUTO_LOAD_TEST %}{# TODO(bcipolli): eliminate this, make the load testing app inherit from / override this page #}
     <script>
         if (window.parent.frames.length === 0) {

python-packages/securesync/engine/models.py

@@ -230,7 +230,7 @@ def full_clean(self, exclude=None, imported=False):
         """
         exclude = exclude or []
         if imported:
-            exclude = list(set(exclude + self._import_excluded_validation_fields))
+            exclude = list(set(tuple(exclude) + self._import_excluded_validation_fields))
         if self.deleted:
             exclude = exclude + [f.name for f in self._meta.fields if isinstance(f, models.ForeignKey) ]
         return super(SyncedModel, self).full_clean(exclude=exclude)

python-packages/securesync/tests/regression_tests.py

@@ -5,12 +5,15 @@
 from mock import patch
 
 from django.test import TestCase
-from securesync.devices.views import central_server_down_or_error
+from ..devices.views import central_server_down_or_error
+from ..devices.models import SyncedModel
 
+class DummySyncedModelClass(SyncedModel):
+    pass
 
 class CentralServerDownMessageTest(TestCase):
     """ Tests that if the central server is down, then an error message
-    sasying as much is returned. Otherwise assume that an actual error message
+    saying as much is returned. Otherwise assume that an actual error message
     was returned by the central server, and pass it along.
     """
 
@@ -27,3 +30,15 @@ def test_error_message_when_central_server_up(self, mock):
         error_msg = "Some error message ah!"
         expected_msg = "Some error message ah!"
         self.assertEqual(central_server_down_or_error(error_msg)['error_msg'], expected_msg)
+
+
+class SimpleBugRegressionTests(TestCase):
+    """ Tests for simple regressions, e.g. caused by syntax or runtime errors.
+    """
+
+    def test_for_full_clean_concatenation_bug(self):
+        """ Tests that SyncedModel.full_clean does not regress with the error:
+        `TypeError: can only concatenate list (not "tuple") to list`
+        """
+        m = DummySyncedModelClass()
+        m.full_clean(imported=True)