Give reasonable names to table fixtures instead of just numbering

Author: ods

tests/conftest.py

@@ -74,7 +74,7 @@ async def _recreate(table_name, create_ddl):
 
 
 TEST1_CREATE_DDL = '''\
-CREATE TABLE test1
+CREATE TABLE test
 (
     id UInt64,
     enum Enum8(''=0, 'ONE'=1, 'TWO'=2),
@@ -88,11 +88,11 @@ async def _recreate(table_name, create_ddl):
 
 
 @pytest.fixture
-async def table_test1(recreate_table):
-    await recreate_table('test1', TEST1_CREATE_DDL)
+async def table_test(recreate_table):
+    await recreate_table('test', TEST1_CREATE_DDL)
 
     return sa.Table(
-        'test1', sa.MetaData(),
+        'test', sa.MetaData(),
         sa.Column('id', sa.Integer),
         sa.Column('enum', sa.Enum, default=''),
         sa.Column('name', sa.String),
@@ -101,8 +101,8 @@ async def table_test1(recreate_table):
     )
 
 
-TEST2_CREATE_DDL = '''\
-CREATE TABLE test2
+TEST_MT_CREATE_DDL = '''\
+CREATE TABLE test_mt
 (
     title String,
     num UInt64
@@ -113,18 +113,18 @@ async def table_test1(recreate_table):
 
 
 @pytest.fixture
-async def table_test2(recreate_table):
-    await recreate_table('test2', TEST2_CREATE_DDL)
+async def table_mt(recreate_table):
+    await recreate_table('test_mt', TEST_MT_CREATE_DDL)
 
     return sa.Table(
-        'test2', sa.MetaData(),
-        sa.Column('title', sa.String),
+        'test_mt', sa.MetaData(),
         sa.Column('num', sa.Integer),
+        sa.Column('title', sa.String),
     )
 
 
-TEST3_CREATE_DDL = '''\
-CREATE TABLE test3
+TEST_SMT_CREATE_DDL = '''\
+CREATE TABLE table_smt
 (
     key UInt8,
     value UInt64
@@ -135,18 +135,18 @@ async def table_test2(recreate_table):
 
 
 @pytest.fixture
-async def table_test3(recreate_table):
-    await recreate_table('test3', TEST3_CREATE_DDL)
+async def table_smt(recreate_table):
+    await recreate_table('table_smt', TEST_SMT_CREATE_DDL)
 
     return sa.Table(
-        'test3', sa.MetaData(),
+        'table_smt', sa.MetaData(),
         sa.Column('key', sa.Integer),
         sa.Column('value', sa.Integer),
     )
 
 
-TEST4_CREATE_DDL = '''\
-CREATE TABLE test4
+TEST_AMT_CREATE_DDL = '''\
+CREATE TABLE test_amt
 (
     key UInt8,
     value AggregateFunction(sum, UInt8)
@@ -157,11 +157,11 @@ async def table_test3(recreate_table):
 
 
 @pytest.fixture
-async def table_test4(recreate_table):
-    await recreate_table('test4', TEST4_CREATE_DDL)
+async def table_amt(recreate_table):
+    await recreate_table('test_amt', TEST_AMT_CREATE_DDL)
 
     return sa.Table(
-        'test4', sa.MetaData(),
+        'test_amt', sa.MetaData(),
         sa.Column('key', sa.Integer),
         sa.Column('value', sa.Integer),
     )

tests/test_exc.py

@@ -37,10 +37,10 @@ async def test_exc_stacktrace(dsn, statement):
     assert len(str(exc_info.value)) < len(exc_info.value.display_text) + 250
 
 
-async def test_exc_row(conn, table_test1):
+async def test_exc_row(conn, table_test):
     with pytest.raises(aiochsa.DBException) as exc_info:
         await conn.execute(
-            table_test1.insert(),
+            table_test.insert(),
             {'amount': Decimal('1234567890.1234567890')},
         )
     assert exc_info.value.code == error_codes.ARGUMENT_OUT_OF_BOUND