Fix tests to support repeating

* test_proto_parse_cardinality() * test_edgeql_insert_default_05() * test_edgeql_dt_sequence_01()
geldata · Jul 10, 2024 · 3164b5a · 3164b5a
1 parent 3a5be70
commit 3164b5a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/edb/testbase/server.py b/edb/testbase/server.py
@@ -184,6 +184,7 @@ def wrapper(self, *args, __meth__=meth, **kwargs):
             if is_repeat and not getattr(self, 'TRANSACTION_ISOLATION', False):
                 raise unittest.SkipTest()
 
+            self.is_repeat = is_repeat
             while True:
                 try:
                     # There might be unobvious serializability
@@ -249,6 +250,7 @@ def __new__(mcls, name, bases, ns):
 
 
 class TestCase(unittest.TestCase, metaclass=TestCaseMeta):
+    is_repeat: bool = False
 
     @classmethod
     def setUpClass(cls):

diff --git a/tests/test_edgeql_datatypes.py b/tests/test_edgeql_datatypes.py
@@ -994,13 +994,15 @@ async def test_edgeql_dt_sequence_01(self):
             r'''SELECT Obj { seq_prop } ORDER BY Obj.seq_prop;''',
             [
                 {'seq_prop': 1}, {'seq_prop': 2}
+            ] if not self.is_repeat else [
+                {'seq_prop': 3}, {'seq_prop': 4}
             ],
         )
 
         await self.assert_query_result(
             r'''SELECT Obj2 { seq_prop };''',
             [
-                {'seq_prop': 1}
+                {'seq_prop': 1 if not self.is_repeat else 2},
             ],
         )
 

diff --git a/tests/test_edgeql_insert.py b/tests/test_edgeql_insert.py
@@ -1951,7 +1951,7 @@ async def test_edgeql_insert_default_05(self):
             r'''
                 SELECT DefaultTest8.number;
             ''',
-            {1, 2, 3}
+            {1, 2, 3} if not self.is_repeat else {4, 5, 6}
         )
 
     async def test_edgeql_insert_default_06(self):

diff --git a/tests/test_protocol.py b/tests/test_protocol.py
@@ -19,6 +19,7 @@
 
 import asyncio
 import contextlib
+import os
 import struct
 
 import edgedb
@@ -436,10 +437,14 @@ async def test_proto_parse_cardinality(self):
         )
 
         await self._execute('CREATE TYPE ParseCardTest')
-        await self.con.recv_match(
-            protocol.CommandComplete,
-            status='CREATE TYPE'
-        )
+        try:
+            await self.con.recv_match(
+                protocol.CommandComplete,
+                status='CREATE TYPE'
+            )
+        except AssertionError:
+            if not self.is_repeat:
+                raise
         await self.con.recv_match(protocol.ReadyForCommand)
 
         await self._parse("SELECT ParseCardTest")