Remove xfails from rewrite tests.

Author: dnwpark

tests/test_model_sync.py

@@ -5268,7 +5268,6 @@ def _testcase(
         _testcase(1, None, 2)
         _testcase(1, 0, 2)
 
-    @tb.xfail  # rewritten link is not refetched
     def test_model_sync_rewrite_insert_02(self):
         # Insert, link with rewrite
 
@@ -5284,7 +5283,14 @@ def _testcase(
 
             self.assertNotEqual(original.target, insert_target)
             assert original.target is not None
-            self.assertEqual(original.target.n, expected_val)
+            self.assertFalse(hasattr(original.target, 'n'))
+
+            rewritten_target = self.client.query_required_single(
+                default.Target.select(n=True)
+                .filter(id=original.target.id)
+                .limit(1)
+            )
+            self.assertEqual(rewritten_target.n, expected_val)
 
             # cleanup
             self.client.query(default.SingleLink.delete())
@@ -5293,8 +5299,13 @@ def _testcase(
         self.client.save(target_zero)
 
         _testcase(None, None, None)
-        _testcase(1, None, 2)
-        _testcase(1, target_zero, 2)
+
+        # Normally we might expect the rewrite to be 1+1 because this is an
+        # insert. However, sync currently splits adding links to a separate
+        # batch query, making it an update. This is surprising, but everything
+        # about rewrites is surprising.
+        _testcase(1, None, 3)
+        _testcase(1, target_zero, 3)
 
     def test_model_sync_rewrite_update_01(self):
         # Update, property with rewrite
@@ -5354,7 +5365,6 @@ def _testcase(
         _testcase(1, 1, 3)
         _testcase(1, 9, 11)
 
-    @tb.xfail  # rewritten link is not refetched
     def test_model_sync_rewrite_update_03(self):
         # Update, link with rewrite
         # Only update the rewrite field
@@ -5383,7 +5393,14 @@ def _testcase(
             self.assertNotEqual(original.target, insert_target)
             self.assertNotEqual(original.target, update_target)
             assert original.target is not None
-            self.assertEqual(original.target.n, expected_val)
+            self.assertFalse(hasattr(original.target, 'n'))
+
+            rewritten_target = self.client.query_required_single(
+                default.Target.select(n=True)
+                .filter(id=original.target.id)
+                .limit(1)
+            )
+            self.assertEqual(rewritten_target.n, expected_val)
 
             # cleanup
             self.client.query(default.SingleLink.delete())
@@ -5394,7 +5411,6 @@ def _testcase(
         _testcase(1, None, 3)
         _testcase(1, target_one, 3)
 
-    @tb.xfail  # rewritten link is not refetched
     def test_model_sync_rewrite_update_04(self):
         # Update, link with rewrite
         # Only update other field
@@ -5422,7 +5438,14 @@ def _testcase(
 
             self.assertNotEqual(original.target, insert_target)
             assert original.target is not None
-            self.assertEqual(original.target.n, expected_val)
+            self.assertFalse(hasattr(original.target, 'n'))
+
+            rewritten_target = self.client.query_required_single(
+                default.Target.select(n=True)
+                .filter(id=original.target.id)
+                .limit(1)
+            )
+            self.assertEqual(rewritten_target.n, expected_val)
 
             # cleanup
             self.client.query(default.SingleLink.delete())