Fixes to tests to get them working with deferred fks

Author: jamalex

tests/testapp/facility_profile/models.py

@@ -60,13 +60,20 @@ class MyUser(AbstractBaseUser, FacilityDataSyncableModel):
     objects = SyncableUserModelManager()
 
     def calculate_source_id(self, *args, **kwargs):
-        return self.username
+        if self._morango_source_id:
+            return self._morango_source_id
+        else:
+            return uuid.uuid5(uuid.UUID("a" * 32), self.username).hex
 
     def calculate_partition(self, *args, **kwargs):
         return '{id}:user'.format(id=self.ID_PLACEHOLDER)
 
     def has_morango_certificate_scope_permission(self, scope_definition_id, scope_params):
-        return self.is_superuser
+        return self.is_superuser        
+
+    @staticmethod
+    def compute_namespaced_id(partition_value, source_id_value, model_name):
+        return source_id_value
 
 
 class SummaryLog(FacilityDataSyncableModel):

tests/testapp/tests/integration/test_syncsession.py

@@ -53,16 +53,20 @@ def setUp(self):
         )
         self.conn.chunk_size = 3
 
-        self.remote_user = self._setUpServer()
+        self.remote_user, self.root_cert_id = self._setUpServer()
         self.filter = Filter("{}:user".format(self.remote_user.id))
-        self.client = self._setUpClient(self.remote_user.id)
+        self.client = self._setUpClient(self.root_cert_id)
         self.session = self.client.sync_session
         self.last_session_activity = self.session.last_activity_timestamp
         self.last_transfer_activity = None
 
-        self.local_user = MyUser.objects.create(
-            id=self.remote_user.id, username="bob", is_superuser=True
-        )
+        # perform an initial sync to ensure the user is on both sides
+        client = self.client.get_pull_client()
+        client.initialize(self.filter)
+        client.run()
+        client.finalize()
+
+        self.local_user = MyUser.objects.first()
 
     def _setUpCertScopes(self):
         root_scope = ScopeDefinition.objects.create(
@@ -90,37 +94,37 @@ def _setUpCertScopes(self):
 
     def _setUpServer(self):
         with second_environment():
-            root_scope, subset_scope = self._setUpCertScopes()
-            root_cert = Certificate.generate_root_certificate(root_scope.id)
+            self.server_root_scope, self.server_subset_scope = self._setUpCertScopes()
+            root_cert = Certificate.generate_root_certificate(self.server_root_scope.id)
 
             remote_user = MyUser.objects.create(
-                id=root_cert.id, username="bob", is_superuser=True
+                _morango_source_id=root_cert.id, username="bob", is_superuser=True
             )
             remote_user.set_password("password")
             remote_user.save()
 
             subset_cert = Certificate(
                 parent=root_cert,
                 profile=self.profile,
-                scope_definition=subset_scope,
-                scope_version=subset_scope.version,
+                scope_definition=self.server_subset_scope,
+                scope_version=self.server_subset_scope.version,
                 scope_params=json.dumps({"user": remote_user.id, "sub": "user"}),
                 private_key=Key(),
             )
             root_cert.sign_certificate(subset_cert)
             subset_cert.save()
-        return remote_user
+        return remote_user, root_cert.id
 
     def _setUpClient(self, primary_partition):
-        root_scope, subset_scope = self._setUpCertScopes()
+        self.client_root_scope, self.client_subset_scope = self._setUpCertScopes()
 
         server_certs = self.conn.get_remote_certificates(
-            primary_partition, root_scope.id
+            primary_partition, self.client_root_scope.id
         )
         server_cert = server_certs[0]
         client_cert = self.conn.certificate_signing_request(
             server_cert,
-            subset_scope.id,
+            self.client_subset_scope.id,
             {"user": primary_partition, "sub": "user"},
             userargs="bob",
             password="password",

tests/testapp/tests/sync/test_controller.py

@@ -428,9 +428,10 @@ def test_record_with_dirty_bit_off_doesnt_deserialize(self):
         self.assertFalse(Facility.objects.filter(id=st.id).exists())
 
     def test_broken_fk_leaves_store_dirty_bit(self):
-        serialized = """{"user_id": "40de9a3fded95d7198f200c78e559353", "id": "bd205b5ee5bc42da85925d24c61341a8"}"""
+        log_id = uuid.uuid4().hex
+        serialized = json.dumps({"user_id": "40de9a3fded95d7198f200c78e559353", "id": log_id})
         st = StoreModelFacilityFactory(
-            id=uuid.uuid4().hex, serialized=serialized, model_name="contentsummarylog"
+            id=log_id, serialized=serialized, model_name="contentsummarylog"
         )
         self.assertTrue(st.dirty_bit)
         self.mc.deserialize_from_store()