Skip to content

Commit

Permalink
remove old test infrastructure
Browse files Browse the repository at this point in the history
  • Loading branch information
@ltalirz
ltalirz committed Dec 12, 2019
1 parent 6cb5825 commit da93dd8
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 451 deletions.
57 changes: 1 addition & 56 deletions aiida/backends/testbase.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

from tornado import ioloop

from aiida.backends.tests import get_db_test_list
from aiida.common.exceptions import ConfigurationError, TestsNotAllowedError, InternalError
from aiida.common.lang import classproperty
from aiida.manage import configuration
Expand Down Expand Up @@ -211,58 +210,4 @@ def setUpClass(cls, *args, **kwargs):
def tearDownClass(cls, *args, **kwargs):
"""Close the PGTest postgres test cluster."""
super().tearDownClass(*args, **kwargs)
cls.pg_test.close()


def run_aiida_db_tests(tests_to_run, verbose=False):
"""
Run all tests specified in tests_to_run.
Return the list of test results.
"""
# Empty test suite that will be populated
test_suite = unittest.TestSuite()

actually_run_tests = []
num_tests_expected = 0

# To avoid adding more than once the same test
# (e.g. if you type both db and db.xxx)
found_modulenames = set()

for test in set(tests_to_run):
try:
modulenames = get_db_test_list()[test]
except KeyError:
if verbose:
print('Unknown DB test {}... skipping'
.format(test), file=sys.stderr)
continue
actually_run_tests.append(test)

for modulename in modulenames:
if modulename not in found_modulenames:
try:
test_suite.addTest(unittest.defaultTestLoader.loadTestsFromName(modulename))
except AttributeError as exception:
try:
import importlib
importlib.import_module(modulename)
except ImportError as exception:
print("[CRITICAL] The module '{}' has an import error and the tests cannot be run:\n{}"
.format(modulename, traceback.format_exc(exception)), file=sys.stderr)
sys.exit(1)
found_modulenames.add(modulename)

num_tests_expected = test_suite.countTestCases()

if verbose:
print('DB tests that will be run: {} (expecting {} tests)'
.format(','.join(actually_run_tests), num_tests_expected), file=sys.stderr)
results = unittest.TextTestRunner(failfast=False, verbosity=2).run(test_suite)
else:
results = unittest.TextTestRunner(failfast=False).run(test_suite)

if verbose:
print('Run tests: {}'.format(results.testsRun))

return results
cls.pg_test.close()
235 changes: 2 additions & 233 deletions aiida/backends/tests/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,236 +9,5 @@
###########################################################################
# pylint: disable=line-too-long
"""
Module for defining tests that required access to (a temporary) database
"""

from aiida.backends import BACKEND_SQLA, BACKEND_DJANGO

DB_TEST_LIST = {
BACKEND_DJANGO: {
'generic': ['aiida.backends.djsite.db.subtests.test_generic'],
'migrations': [
'aiida.backends.djsite.db.subtests.migrations.test_migrations_many',
'aiida.backends.djsite.db.subtests.migrations.test_migrations_0037_attributes_extras_settings_json',
'aiida.backends.djsite.db.subtests.migrations.test_migrations_0038_data_migration_legacy_job_calculations',
'aiida.backends.djsite.db.subtests.migrations.test_migrations_0040_data_migration_legacy_process_attributes',
'aiida.backends.djsite.db.subtests.migrations.test_migrations_0041_seal_unsealed_processes',
'aiida.backends.djsite.db.subtests.migrations.test_migrations_0043_default_link_label',
],
},
BACKEND_SQLA: {
'generic': ['aiida.backends.sqlalchemy.tests.test_generic'],
'nodes': ['aiida.backends.sqlalchemy.tests.test_nodes'],
'query': ['aiida.backends.sqlalchemy.tests.test_query'],
'session': ['aiida.backends.sqlalchemy.tests.test_session'],
'schema': ['aiida.backends.sqlalchemy.tests.test_schema'],
'migrations': ['aiida.backends.sqlalchemy.tests.test_migrations'],
},
# Must be always defined (in the worst case, an empty dict)
'common': {
'base_dataclasses': ['aiida.backends.tests.test_base_dataclasses'],
'calculation_node': ['aiida.backends.tests.test_calculation_node'],
'cmdline.commands.calcjob': ['aiida.backends.tests.cmdline.commands.test_calcjob'],
'cmdline.commands.code': ['aiida.backends.tests.cmdline.commands.test_code'],
'cmdline.commands.comment': ['aiida.backends.tests.cmdline.commands.test_comment'],
'cmdline.commands.computer': ['aiida.backends.tests.cmdline.commands.test_computer'],
'cmdline.commands.config': ['aiida.backends.tests.cmdline.commands.test_config'],
'cmdline.commands.daemon': ['aiida.backends.tests.cmdline.commands.test_daemon'],
'cmdline.commands.data': ['aiida.backends.tests.cmdline.commands.test_data'],
'cmdline.commands.database': ['aiida.backends.tests.cmdline.commands.test_database'],
'cmdline.commands.export': ['aiida.backends.tests.cmdline.commands.test_export'],
'cmdline.commands.graph': ['aiida.backends.tests.cmdline.commands.test_graph'],
'cmdline.commands.group': ['aiida.backends.tests.cmdline.commands.test_group'],
'cmdline.commands.help': ['aiida.backends.tests.cmdline.commands.test_help'],
'cmdline.commands.import': ['aiida.backends.tests.cmdline.commands.test_import'],
'cmdline.commands.node': ['aiida.backends.tests.cmdline.commands.test_node'],
'cmdline.commands.process': ['aiida.backends.tests.cmdline.commands.test_process'],
'cmdline.commands.profile': ['aiida.backends.tests.cmdline.commands.test_profile'],
'cmdline.commands.rehash': ['aiida.backends.tests.cmdline.commands.test_rehash'],
'cmdline.commands.run': ['aiida.backends.tests.cmdline.commands.test_run'],
'cmdline.commands.setup': ['aiida.backends.tests.cmdline.commands.test_setup'],
'cmdline.commands.status': ['aiida.backends.tests.cmdline.commands.test_status'],
'cmdline.commands.user': ['aiida.backends.tests.cmdline.commands.test_user'],
'cmdline.commands.verdi': ['aiida.backends.tests.cmdline.commands.test_verdi'],
'cmdline.commands.restapi': ['aiida.backends.tests.cmdline.commands.test_restapi'],
'cmdline.params.types.calculation': ['aiida.backends.tests.cmdline.params.types.test_calculation'],
'cmdline.params.types.code': ['aiida.backends.tests.cmdline.params.types.test_code'],
'cmdline.params.types.computer': ['aiida.backends.tests.cmdline.params.types.test_computer'],
'cmdline.params.types.data': ['aiida.backends.tests.cmdline.params.types.test_data'],
'cmdline.params.types.group': ['aiida.backends.tests.cmdline.params.types.test_group'],
'cmdline.params.types.identifier': ['aiida.backends.tests.cmdline.params.types.test_identifier'],
'cmdline.params.types.node': ['aiida.backends.tests.cmdline.params.types.test_node'],
'cmdline.params.types.path': ['aiida.backends.tests.cmdline.params.types.test_path'],
'cmdline.params.types.plugin': ['aiida.backends.tests.cmdline.params.types.test_plugin'],
'cmdline.utils.common': ['aiida.backends.tests.cmdline.utils.test_common'],
'common.extendeddicts': ['aiida.backends.tests.common.test_extendeddicts'],
'common.folders': ['aiida.backends.tests.common.test_folders'],
'common.hashing': ['aiida.backends.tests.common.test_hashing'],
'common.lang': ['aiida.backends.tests.common.test_lang'],
'common.links': ['aiida.backends.tests.common.test_links'],
'common.logging': ['aiida.backends.tests.common.test_logging'],
'common.serialize': ['aiida.backends.tests.common.test_serialize'],
'common.timezone': ['aiida.backends.tests.common.test_timezone'],
'common.utils': ['aiida.backends.tests.common.test_utils'],
'dataclasses': ['aiida.backends.tests.test_dataclasses'],
'dbimporters': ['aiida.backends.tests.test_dbimporters'],
'engine.daemon.client': ['aiida.backends.tests.engine.daemon.test_client'],
'engine.calc_job': ['aiida.backends.tests.engine.test_calc_job'],
'engine.calcfunctions': ['aiida.backends.tests.engine.test_calcfunctions'],
'engine.class_loader': ['aiida.backends.tests.engine.test_class_loader'],
'engine.daemon': ['aiida.backends.tests.engine.test_daemon'],
'engine.futures': ['aiida.backends.tests.engine.test_futures'],
'engine.launch': ['aiida.backends.tests.engine.test_launch'],
'engine.manager': ['aiida.backends.tests.engine.test_manager'],
'engine.persistence': ['aiida.backends.tests.engine.test_persistence'],
'engine.ports': ['aiida.backends.tests.engine.test_ports'],
'engine.process': ['aiida.backends.tests.engine.test_process'],
'engine.process_builder': ['aiida.backends.tests.engine.test_process_builder'],
'engine.process_function': ['aiida.backends.tests.engine.test_process_function'],
'engine.process_spec': ['aiida.backends.tests.engine.test_process_spec'],
'engine.rmq': ['aiida.backends.tests.engine.test_rmq'],
'engine.run': ['aiida.backends.tests.engine.test_run'],
'engine.runners': ['aiida.backends.tests.engine.test_runners'],
'engine.transport': ['aiida.backends.tests.engine.test_transport'],
'engine.utils': ['aiida.backends.tests.engine.test_utils'],
'engine.work_chain': ['aiida.backends.tests.engine.test_work_chain'],
'engine.workfunctions': ['aiida.backends.tests.engine.test_workfunctions'],
'generic': ['aiida.backends.tests.test_generic'],
'manage.backup.backup_script': ['aiida.backends.tests.manage.backup.test_backup_script'],
'manage.backup.backup_setup_script': ['aiida.backends.tests.manage.backup.test_backup_setup_script'],
'manage.caching.': ['aiida.backends.tests.manage.test_caching'],
'manage.configuration.config.': ['aiida.backends.tests.manage.configuration.test_config'],
'manage.configuration.migrations.': ['aiida.backends.tests.manage.configuration.migrations.test_migrations'],
'manage.configuration.options.': ['aiida.backends.tests.manage.configuration.test_options'],
'manage.configuration.profile.': ['aiida.backends.tests.manage.configuration.test_profile'],
'manage.external.postgres': ['aiida.backends.tests.manage.external.test_postgres'],
'nodes': ['aiida.backends.tests.test_nodes'],
'orm.authinfos': ['aiida.backends.tests.orm.test_authinfos'],
'orm.comments': ['aiida.backends.tests.orm.test_comments'],
'orm.computers': ['aiida.backends.tests.orm.test_computers'],
'orm.data.data': ['aiida.backends.tests.orm.data.test_data'],
'orm.data.dict': ['aiida.backends.tests.orm.data.test_dict'],
'orm.data.folder': ['aiida.backends.tests.orm.data.test_folder'],
'orm.data.kpoints': ['aiida.backends.tests.orm.data.test_kpoints'],
'orm.data.orbital': ['aiida.backends.tests.orm.data.test_orbital'],
'orm.data.remote': ['aiida.backends.tests.orm.data.test_remote'],
'orm.data.singlefile': ['aiida.backends.tests.orm.data.test_singlefile'],
'orm.data.upf': ['aiida.backends.tests.orm.data.test_upf'],
'orm.data.to_aiida_type': ['aiida.backends.tests.orm.data.test_to_aiida_type'],
'orm.entities': ['aiida.backends.tests.orm.test_entities'],
'orm.groups': ['aiida.backends.tests.orm.test_groups'],
'orm.implementation.backend': ['aiida.backends.tests.orm.implementation.test_backend'],
'orm.implementation.comments': ['aiida.backends.tests.orm.implementation.test_comments'],
'orm.implementation.logs': ['aiida.backends.tests.orm.implementation.test_logs'],
'orm.implementation.nodes': ['aiida.backends.tests.orm.implementation.test_nodes'],
'orm.logs': ['aiida.backends.tests.orm.test_logs'],
'orm.mixins': ['aiida.backends.tests.orm.test_mixins'],
'orm.node.calcjob': ['aiida.backends.tests.orm.node.test_calcjob'],
'orm.node.node': ['aiida.backends.tests.orm.node.test_node'],
'orm.querybuilder': ['aiida.backends.tests.orm.test_querybuilder'],
'orm.utils.calcjob': ['aiida.backends.tests.orm.utils.test_calcjob'],
'orm.utils.node': ['aiida.backends.tests.orm.utils.test_node'],
'orm.utils.loaders': ['aiida.backends.tests.orm.utils.test_loaders'],
'orm.utils.repository': ['aiida.backends.tests.orm.utils.test_repository'],
'parsers.parser': ['aiida.backends.tests.parsers.test_parser'],
'plugins.entry_point': ['aiida.backends.tests.plugins.test_entry_point'],
'plugins.factories': ['aiida.backends.tests.plugins.test_factories'],
'plugins.utils': ['aiida.backends.tests.plugins.test_utils'],
'restapi.identifiers': ['aiida.backends.tests.restapi.test_identifiers'],
'restapi': ['aiida.backends.tests.test_restapi'],
'tools.data.orbital': ['aiida.backends.tests.tools.data.orbital.test_orbitals'],
'tools.importexport.common.archive': ['aiida.backends.tests.tools.importexport.common.test_archive'],
'tools.importexport.complex': ['aiida.backends.tests.tools.importexport.test_complex'],
'tools.importexport.prov_redesign': ['aiida.backends.tests.tools.importexport.test_prov_redesign'],
'tools.importexport.simple': ['aiida.backends.tests.tools.importexport.test_simple'],
'tools.importexport.specific_import': ['aiida.backends.tests.tools.importexport.test_specific_import'],
'tools.importexport.migration.migration': ['aiida.backends.tests.tools.importexport.migration.test_migration'],
'tools.importexport.migration.v01_to_v02': ['aiida.backends.tests.tools.importexport.migration.test_v01_to_v02'],
'tools.importexport.migration.v02_to_v03': ['aiida.backends.tests.tools.importexport.migration.test_v02_to_v03'],
'tools.importexport.migration.v03_to_v04': ['aiida.backends.tests.tools.importexport.migration.test_v03_to_v04'],
'tools.importexport.migration.v04_to_v05': ['aiida.backends.tests.tools.importexport.migration.test_v04_to_v05'],
'tools.importexport.migration.v05_to_v06': ['aiida.backends.tests.tools.importexport.migration.test_v05_to_v06'],
'tools.importexport.migration.v06_to_v07': ['aiida.backends.tests.tools.importexport.migration.test_v06_to_v07'],
'tools.importexport.migration.v07_to_v08': ['aiida.backends.tests.tools.importexport.migration.test_v07_to_v08'],
'tools.importexport.orm.attributes': ['aiida.backends.tests.tools.importexport.orm.test_attributes'],
'tools.importexport.orm.calculations': ['aiida.backends.tests.tools.importexport.orm.test_calculations'],
'tools.importexport.orm.codes': ['aiida.backends.tests.tools.importexport.orm.test_codes'],
'tools.importexport.orm.comments': ['aiida.backends.tests.tools.importexport.orm.test_comments'],
'tools.importexport.orm.computers': ['aiida.backends.tests.tools.importexport.orm.test_computers'],
'tools.importexport.orm.extras': ['aiida.backends.tests.tools.importexport.orm.test_extras'],
'tools.importexport.orm.groups': ['aiida.backends.tests.tools.importexport.orm.test_groups'],
'tools.importexport.orm.links': ['aiida.backends.tests.tools.importexport.orm.test_links'],
'tools.importexport.orm.logs': ['aiida.backends.tests.tools.importexport.orm.test_logs'],
'tools.importexport.orm.users': ['aiida.backends.tests.tools.importexport.orm.test_users'],
'tools.visualization.graph': ['aiida.backends.tests.tools.visualization.test_graph']
}
}


def get_db_test_names():
"""
Return a sorted list of test names
"""
retlist = []
for backend in DB_TEST_LIST:
for name in DB_TEST_LIST[backend]:
retlist.append(name)

# Explode the list so that if I have a.b.c,
# I can run it also just with 'a' or with 'a.b'
final_list = [_ for _ in retlist]
for k in retlist:
if '.' in k:
parts = k.split('.')
for last_idx in range(1, len(parts)):
parentkey = '.'.join(parts[:last_idx])
final_list.append(parentkey)

# return the list of possible names, without duplicates
return sorted(set(final_list))


def get_db_test_list():
"""
This function returns the DB_TEST_LIST for the current backend,
merged with the 'common' tests.
:note: This function should be called only after setting the
backend, and then it returns only the tests for this backend, and the common ones.
"""
from collections import defaultdict
from aiida.common.exceptions import ConfigurationError
from aiida.manage import configuration

try:
be_tests = DB_TEST_LIST[configuration.PROFILE.database_backend]
except KeyError:
raise ConfigurationError('No backend configured yet')

# Could be undefined, so put to empty dict by default
try:
common_tests = DB_TEST_LIST['common']
except KeyError:
raise ConfigurationError("A 'common' key must always be defined!")

retdict = defaultdict(list)
for k, tests in common_tests.items():
for test in tests:
retdict[k].append(test)
for k, tests in be_tests.items():
for test in tests:
retdict[k].append(test)

# Explode the dictionary so that if I have a.b.c,
# I can run it also just with 'a' or with 'a.b'
final_retdict = defaultdict(list)
for key, val in retdict.items():
final_retdict[key] = val
for key, val in retdict.items():
if '.' in key:
parts = key.split('.')
for last_idx in range(1, len(parts)):
parentkey = '.'.join(parts[:last_idx])
final_retdict[parentkey].extend(val)

return dict(final_retdict)
Tests that require access to a (temporary) database
"""
Loading

0 comments on commit da93dd8

Please sign in to comment.