tests: remove usage of obsolete @postgresql mark (removed in #39641)

This commit is contained in:
Frédéric Péters 2021-04-18 12:10:04 +02:00
parent b10c47bfc9
commit d1bd081f58
1 changed files with 1 additions and 85 deletions

View File

@ -5,6 +5,7 @@ import random
import string
import time
import psycopg2
import pytest
from quixote import cleanup
@ -19,13 +20,6 @@ from wcs.workflows import CommentableWorkflowStatusItem, Workflow, WorkflowCriti
from .utilities import clean_temporary_pub, create_temporary_pub
postgresql = pytest.mark.postgresql
try:
import psycopg2
except ImportError:
pass
def setup_module(module):
global pub, formdef
@ -52,7 +46,6 @@ def teardown_module(module):
clean_temporary_pub()
@postgresql
def test_sql_table_name_invalid_chars():
test_formdef = FormDef()
test_formdef.name = 'test-some|char;are better/ignored'
@ -63,18 +56,15 @@ def test_sql_table_name_invalid_chars():
assert data_class.count() == 0
@postgresql
def test_sql_data_class():
formdef.data_class(mode='sql')
@postgresql
def test_sql_count():
data_class = formdef.data_class(mode='sql')
assert data_class.count() == 0
@postgresql
def test_sql_store():
data_class = formdef.data_class(mode='sql')
formdata = data_class()
@ -84,7 +74,6 @@ def test_sql_store():
assert formdata.id
@postgresql
def test_sql_get():
data_class = formdef.data_class(mode='sql')
formdata = data_class()
@ -98,7 +87,6 @@ def test_sql_get():
assert formdata.status == 'wf-0'
@postgresql
def test_sql_store_channel():
data_class = formdef.data_class(mode='sql')
formdata = data_class()
@ -114,7 +102,6 @@ def test_sql_store_channel():
assert data_class.get(formdata.id).submission_channel is None
@postgresql
def test_sql_get_missing():
data_class = formdef.data_class(mode='sql')
with pytest.raises(KeyError):
@ -123,7 +110,6 @@ def test_sql_get_missing():
data_class.get('xxx')
@postgresql
def test_sql_get_missing_ignore_errors():
data_class = formdef.data_class(mode='sql')
assert data_class.get(123456, ignore_errors=True) is None
@ -142,48 +128,40 @@ def check_sql_field(no, value):
assert formdata.data.get(no) == value
@postgresql
def test_sql_field_string():
check_sql_field('0', 'hello world')
check_sql_field('0', 'élo world')
check_sql_field('0', None)
@postgresql
def test_sql_field_email():
check_sql_field('1', 'fred@example.com')
@postgresql
def test_sql_field_text():
check_sql_field('2', 'long text')
check_sql_field('2', 'long tèxt')
@postgresql
def test_sql_field_bool():
check_sql_field('3', False)
check_sql_field('3', True)
@postgresql
def test_sql_field_item():
check_sql_field('4', 'apricot')
@postgresql
def test_sql_field_date():
check_sql_field('5', datetime.date.today().timetuple())
@postgresql
def test_sql_field_items():
check_sql_field('6', ['apricot'])
check_sql_field('6', ['apricot', 'pear'])
check_sql_field('6', ['pomme', 'poire', 'pêche'])
@postgresql
def test_sql_geoloc():
test_formdef = FormDef()
test_formdef.name = 'geoloc'
@ -209,7 +187,6 @@ def test_sql_geoloc():
assert formdata2.geolocations == formdata.geolocations
@postgresql
def test_sql_multi_geoloc():
test_formdef = FormDef()
test_formdef.name = 'geoloc'
@ -238,7 +215,6 @@ def test_sql_multi_geoloc():
assert formdata2.geolocations == {'base': {'lat': 12, 'lon': 21}}
@postgresql
def test_sql_change():
data_class = formdef.data_class(mode='sql')
formdata = data_class()
@ -255,7 +231,6 @@ def test_sql_change():
assert formdata.data.get('0') == 'test2'
@postgresql
def test_sql_remove():
data_class = formdef.data_class(mode='sql')
formdata = data_class()
@ -271,7 +246,6 @@ def test_sql_remove():
data_class.get(id)
@postgresql
def test_sql_wipe():
data_class = formdef.data_class(mode='sql')
formdata = data_class()
@ -282,7 +256,6 @@ def test_sql_wipe():
assert data_class.count() == 0
@postgresql
def test_sql_evolution():
data_class = formdef.data_class(mode='sql')
formdata = data_class()
@ -305,7 +278,6 @@ def test_sql_evolution():
assert formdata.evolution[-1].comment == 'hello world'
@postgresql
def test_sql_evolution_change():
data_class = formdef.data_class(mode='sql')
formdata = data_class()
@ -335,7 +307,6 @@ def test_sql_evolution_change():
assert formdata.evolution[-1].comment == 'foobar'
@postgresql
def test_sql_multiple_evolutions():
data_class = formdef.data_class(mode='sql')
for i in range(20):
@ -358,7 +329,6 @@ def test_sql_multiple_evolutions():
assert [x._evolution for x in values]
@postgresql
def test_sql_get_ids_with_indexed_value():
data_class = formdef.data_class(mode='sql')
data_class.wipe()
@ -380,7 +350,6 @@ def test_sql_get_ids_with_indexed_value():
assert set(ids) == set([id2, id3])
@postgresql
def test_sql_get_ids_from_query():
data_class = formdef.data_class(mode='sql')
data_class.wipe()
@ -407,7 +376,6 @@ def test_sql_get_ids_from_query():
assert set(ids) == set([id2])
@postgresql
def test_sql_rollback_on_error():
data_class = formdef.data_class(mode='sql')
data_class.wipe()
@ -418,7 +386,6 @@ def test_sql_rollback_on_error():
data_class.wipe()
@postgresql
def test_sql_get_ids_with_indexed_value_dict():
data_class = formdef.data_class(mode='sql')
data_class.wipe()
@ -440,7 +407,6 @@ def test_sql_get_ids_with_indexed_value_dict():
assert set(ids) == set([id2, id3])
@postgresql
def test_create_user():
sql.SqlUser.wipe()
@ -449,7 +415,6 @@ def test_create_user():
user.store()
@postgresql
def test_get_user():
sql.SqlUser.wipe()
@ -460,7 +425,6 @@ def test_get_user():
assert sql.SqlUser.get(user.id) is not None
@postgresql
def test_get_missing_user():
sql.SqlUser.wipe()
@ -468,14 +432,12 @@ def test_get_missing_user():
sql.SqlUser.get(12345)
@postgresql
def test_get_missing_user_ignore_errors():
sql.SqlUser.wipe()
assert sql.SqlUser.get(12345, ignore_errors=True) is None
@postgresql
def test_user_formdef():
sql.SqlUser.wipe()
@ -496,7 +458,6 @@ def test_user_formdef():
pub.write_cfg()
@postgresql
def test_get_users_with_role():
sql.SqlUser.wipe()
@ -512,7 +473,6 @@ def test_get_users_with_role():
assert len(sql.SqlUser.get_users_with_role(1)) == 1
@postgresql
def test_get_users_with_name_identifier():
sql.SqlUser.wipe()
@ -529,7 +489,6 @@ def test_get_users_with_name_identifier():
assert sql.SqlUser.get_users_with_name_identifier('foo')[0].name == 'Pierre'
@postgresql
def test_get_users_fts():
sql.SqlUser.wipe()
@ -547,7 +506,6 @@ def test_get_users_fts():
assert sql.SqlUser.get(sql.SqlUser.get_ids_from_query('pierre')[0]).id == user_id
@postgresql
def test_get_users_formdef_fts():
sql.SqlUser.wipe()
@ -573,7 +531,6 @@ def test_get_users_formdef_fts():
pub.write_cfg()
@postgresql
def test_urlname_change():
data_class = formdef.data_class(mode='sql')
data_class.wipe()
@ -601,7 +558,6 @@ def test_urlname_change():
assert data_class.count() == 1
@postgresql
def test_sql_table_add_and_remove_fields():
test_formdef = FormDef()
test_formdef.name = 'tests and and remove fields'
@ -653,7 +609,6 @@ def test_sql_table_add_and_remove_fields():
data_class.select()
@postgresql
def test_sql_table_wipe_and_drop():
test_formdef = FormDef()
test_formdef.name = 'tests wipe and drop'
@ -679,7 +634,6 @@ def test_sql_table_wipe_and_drop():
assert table_exists(cur, test_formdef.table_name)
@postgresql
def test_sql_indexes():
test_formdef = FormDef()
test_formdef.name = 'tests indexes'
@ -699,7 +653,6 @@ def test_sql_indexes():
cur.close()
@postgresql
def test_sql_table_select():
test_formdef = FormDef()
test_formdef.name = 'table select'
@ -730,7 +683,6 @@ def test_sql_table_select():
assert len(data_class.select([st.NotContains('id', [])])) == 50
@postgresql
def test_sql_table_select_iterator():
test_formdef = FormDef()
test_formdef.name = 'table select'
@ -766,7 +718,6 @@ def test_sql_table_select_iterator():
)
@postgresql
def test_sql_table_select_datetime():
test_formdef = FormDef()
test_formdef.name = 'table select datetime'
@ -795,7 +746,6 @@ def test_sql_table_select_datetime():
)
@postgresql
def test_select_limit_offset():
test_formdef = FormDef()
test_formdef.name = 'table select limit offset'
@ -831,7 +781,6 @@ def test_select_limit_offset():
assert len([x.id for x in data_class.select(lambda x: x.id > 10, limit=10, iterator=iterator)]) == 10
@postgresql
def test_select_criteria_intersects():
data_class = formdef.data_class(mode='sql')
data_class.wipe()
@ -858,7 +807,6 @@ def test_select_criteria_intersects():
assert len(data_class.select([st.Intersects('f6', ['apple'])])) == 0
@postgresql
def test_count():
test_formdef = FormDef()
test_formdef.name = 'table select count'
@ -875,7 +823,6 @@ def test_count():
assert data_class.count([st.Less('id', 26)]) == 25
@postgresql
def test_select_criteria_or_and():
test_formdef = FormDef()
test_formdef.name = 'table select criteria or and'
@ -900,7 +847,6 @@ def test_select_criteria_or_and():
] == list(range(6, 10))
@postgresql
def test_select_criteria_null():
test_formdef = FormDef()
test_formdef.name = 'table select criteria null'
@ -921,7 +867,6 @@ def test_select_criteria_null():
assert len(data_class.select([st.NotNull('submission_channel')])) == 17
@postgresql
def test_sql_table_select_bool():
test_formdef = FormDef()
test_formdef.name = 'table select bool'
@ -943,7 +888,6 @@ def test_sql_table_select_bool():
assert len(data_class.select([st.Equal('f3', False)])) == 49
@postgresql
def test_sql_criteria_ilike():
test_formdef = FormDef()
test_formdef.name = 'table select bool'
@ -968,7 +912,6 @@ def test_sql_criteria_ilike():
assert [x.id for x in data_class.select([st.ILike('f3', 'BAR')], order_by='id')] == list(range(21, 51))
@postgresql
def test_sql_criteria_fts():
test_formdef = FormDef()
test_formdef.name = 'table select fts'
@ -1062,7 +1005,6 @@ def index_exists(cur, index_name):
return bool(cur.fetchone()[0] == 1)
@postgresql
def test_sql_level():
conn, cur = sql.get_connection_and_cursor()
cur.execute('DROP TABLE wcs_meta')
@ -1088,7 +1030,6 @@ def migration_level(cur):
return int(row[0])
@postgresql
def test_migration_1_tracking_code():
conn, cur = sql.get_connection_and_cursor()
cur.execute('DROP TABLE wcs_meta')
@ -1101,7 +1042,6 @@ def test_migration_1_tracking_code():
cur.close()
@postgresql
def test_migration_2_formdef_id_in_views():
conn, cur = sql.get_connection_and_cursor()
cur.execute('UPDATE wcs_meta SET value = 1 WHERE key = %s', ('sql_level',))
@ -1149,7 +1089,6 @@ def test_migration_2_formdef_id_in_views():
cur.close()
@postgresql
def test_migration_6_actions_roles():
conn, cur = sql.get_connection_and_cursor()
cur.execute('UPDATE wcs_meta SET value = 5 WHERE key = %s', ('sql_level',))
@ -1175,7 +1114,6 @@ def test_migration_6_actions_roles():
cur.close()
@postgresql
def test_migration_10_submission_channel():
conn, cur = sql.get_connection_and_cursor()
cur.execute('UPDATE wcs_meta SET value = 9 WHERE key = %s', ('sql_level',))
@ -1201,7 +1139,6 @@ def test_migration_10_submission_channel():
cur.close()
@postgresql
def test_migration_12_users_fts():
conn, cur = sql.get_connection_and_cursor()
cur.execute('UPDATE wcs_meta SET value = 11 WHERE key = %s', ('sql_level',))
@ -1236,7 +1173,6 @@ def test_migration_12_users_fts():
cur.close()
@postgresql
def test_migration_21_users_ascii_name():
conn, cur = sql.get_connection_and_cursor()
cur.execute('UPDATE wcs_meta SET value = 11 WHERE key = %s', ('sql_level',))
@ -1271,7 +1207,6 @@ def test_migration_21_users_ascii_name():
cur.close()
@postgresql
def test_migration_24_evolution_index():
formdef = FormDef()
formdef.name = 'tests migration 24'
@ -1298,7 +1233,6 @@ def test_migration_24_evolution_index():
cur.close()
@postgresql
def test_migration_38_user_deleted():
conn, cur = sql.get_connection_and_cursor()
cur.execute('UPDATE wcs_meta SET value = 37 WHERE key = %s', ('sql_level',))
@ -1336,7 +1270,6 @@ def drop_formdef_tables():
cur.execute('DROP TABLE %s CASCADE' % table_name)
@postgresql
def test_is_at_endpoint():
drop_formdef_tables()
_, cur = sql.get_connection_and_cursor()
@ -1385,7 +1318,6 @@ def test_is_at_endpoint():
assert bool(cur.fetchone()[0] == 2)
@postgresql
def test_views_fts():
drop_formdef_tables()
_, cur = sql.get_connection_and_cursor()
@ -1413,7 +1345,6 @@ def test_views_fts():
assert bool(cur.fetchone()[0] == 1)
@postgresql
def test_select_any_formdata():
drop_formdef_tables()
@ -1473,7 +1404,6 @@ def test_select_any_formdata():
assert [(x.formdef_id, x.id) for x in objects2] == [(x.formdef_id, x.id) for x in objects][20:30]
@postgresql
def test_load_all_evolutions_on_any_formdata():
drop_formdef_tables()
@ -1504,7 +1434,6 @@ def test_load_all_evolutions_on_any_formdata():
assert len([x for x in objects if x._evolution is not None]) == 100
@postgresql
def test_geoloc_in_global_view():
drop_formdef_tables()
@ -1545,7 +1474,6 @@ def test_geoloc_in_global_view():
assert int(objects2[0].geolocations['base']['lon']) == formdata.geolocations['base']['lon']
@postgresql
def test_actions_roles():
drop_formdef_tables()
_, cur = sql.get_connection_and_cursor()
@ -1611,7 +1539,6 @@ def test_actions_roles():
assert formdatas[0].id == formdata_id
@postgresql
def test_last_update_time():
drop_formdef_tables()
_, cur = sql.get_connection_and_cursor()
@ -1661,7 +1588,6 @@ def test_last_update_time():
assert bool(cur.fetchone()[0] == formdata2.id)
@postgresql
def test_view_formdef_name():
drop_formdef_tables()
_, cur = sql.get_connection_and_cursor()
@ -1696,7 +1622,6 @@ def test_view_formdef_name():
assert bool(str(cur.fetchone()[0]) == str(formdef2.id))
@postgresql
def test_view_user_name():
drop_formdef_tables()
_, cur = sql.get_connection_and_cursor()
@ -1729,7 +1654,6 @@ def test_view_user_name():
assert bool(cur.fetchone()[0] == user.name)
@postgresql
def test_select_formdata_after_formdef_removal():
drop_formdef_tables()
@ -1754,7 +1678,6 @@ def test_select_formdata_after_formdef_removal():
assert len(objects) == 1
@postgresql
def test_views_submission_info():
drop_formdef_tables()
_, cur = sql.get_connection_and_cursor()
@ -1784,7 +1707,6 @@ def test_views_submission_info():
assert bool(cur.fetchone()[0] == 1)
@postgresql
def test_get_formdef_new_id():
test1_formdef = FormDef()
test1_formdef.name = 'new formdef'
@ -1802,7 +1724,6 @@ def test_get_formdef_new_id():
assert test1_table_name != test2_formdef.table_name
@postgresql
def test_criticality_levels():
drop_formdef_tables()
@ -1856,7 +1777,6 @@ def test_criticality_levels():
assert objects[-2].get_criticality_level_object().name == 'green'
@postgresql
def test_view_performances():
pytest.skip('takes too much time')
@ -1953,7 +1873,6 @@ def test_view_performances():
assert (time.time() - t0) < 0.5
@postgresql
def test_migration_30_anonymize_evo_who():
formdef = FormDef()
formdef.name = 'tests migration 24'
@ -1998,7 +1917,6 @@ def test_migration_30_anonymize_evo_who():
cur.close()
@postgresql
def test_migration_31_user_label():
conn, cur = sql.get_connection_and_cursor()
cur.execute('UPDATE wcs_meta SET value = 30 WHERE key = %s', ('sql_level',))
@ -2020,7 +1938,6 @@ def test_migration_31_user_label():
cur.close()
@postgresql
def test_migration_38_submission_agent_id():
for formdef in FormDef.select():
formdef.data_class().wipe()
@ -2057,7 +1974,6 @@ def test_migration_38_submission_agent_id():
cur.close()
@postgresql
def test_migration_40_user_is_active():
conn, cur = sql.get_connection_and_cursor()
cur.execute('UPDATE wcs_meta SET value = 39 WHERE key = %s', ('sql_level',))