diff --git a/code_review.md b/code_review.md index 25dadbd378..3851fd1f07 100644 --- a/code_review.md +++ b/code_review.md @@ -28,7 +28,7 @@ expectations for contributors about what to expect. - [ ] Does this duplicate functionality found elsewhere? - [ ] Does it make more sense for this to be implemented elsewhere? E.g. Should this happen in the storage service vs. a client script, or should a helper - function live in archivematicaCommon? + function live in common? - [ ] Does this add or reduce technical debt? - [ ] Does this conflict with or benefit from work being done in parallel? - [ ] Does this have security implications? Does it add or close a security diff --git a/hack/Dockerfile b/hack/Dockerfile index ee239a893d..9769ea9199 100644 --- a/hack/Dockerfile +++ b/hack/Dockerfile @@ -224,15 +224,15 @@ COPY --chown=${USER_ID}:${GROUP_ID} --link . /src FROM base AS archivematica-mcp-client ENV DJANGO_SETTINGS_MODULE=settings.common -ENV PYTHONPATH=/src/src/MCPClient/:/src/src/MCPClient/clientScripts:/src/src/archivematicaCommon/:/src/src/dashboard/ +ENV PYTHONPATH=/src/src/MCPClient/:/src/src/MCPClient/clientScripts:/src/src/common/:/src/src/dashboard/ ENV ARCHIVEMATICA_MCPCLIENT_ARCHIVEMATICACLIENTMODULES=/src/src/MCPClient/archivematicaClientModules ENV ARCHIVEMATICA_MCPCLIENT_CLIENTASSETSDIRECTORY=/src/src/MCPClient/assets/ ENV ARCHIVEMATICA_MCPCLIENT_CLIENTSCRIPTSDIRECTORY=/src/src/MCPClient/clientScripts/ # Some scripts in archivematica-fpr-admin executed by MCPClient rely on certain # files being available in this image (e.g. see https://git.io/vA1wF). -COPY --link src/archivematicaCommon/externals/fido/ /usr/lib/archivematica/archivematicaCommon/externals/fido/ -COPY --link src/archivematicaCommon/externals/fiwalk_plugins/ /usr/lib/archivematica/archivematicaCommon/externals/fiwalk_plugins/ +COPY --link src/common/externals/fido/ /usr/lib/archivematica/common/externals/fido/ +COPY --link src/common/externals/fiwalk_plugins/ /usr/lib/archivematica/common/externals/fiwalk_plugins/ ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPClient/archivematicaClient.py"] @@ -241,7 +241,7 @@ ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPClient/archivematicaClient. FROM base AS archivematica-mcp-server ENV DJANGO_SETTINGS_MODULE=settings.common -ENV PYTHONPATH=/src/src/MCPServer/:/src/src/archivematicaCommon/:/src/src/dashboard/ +ENV PYTHONPATH=/src/src/MCPServer/:/src/src/common/:/src/src/dashboard/ ENTRYPOINT ["pyenv", "exec", "python3", "/src/src/MCPServer/archivematicaMCP.py"] @@ -271,7 +271,7 @@ COPY --chown=${USER_ID}:${GROUP_ID} --from=archivematica-dashboard-frontend-buil WORKDIR /src/src/dashboard ENV DJANGO_SETTINGS_MODULE=settings.local -ENV PYTHONPATH=/src/src/dashboard/:/src/src/archivematicaCommon/ +ENV PYTHONPATH=/src/src/dashboard/:/src/src/common/ ENV AM_GUNICORN_BIND=0.0.0.0:8000 ENV AM_GUNICORN_CHDIR=/src/src/dashboard ENV FORWARDED_ALLOW_IPS=* @@ -305,7 +305,7 @@ RUN set -ex \ && mkdir -p /var/archivematica/.cache/ms-playwright \ && python3 -m playwright install firefox -ENV PYTHONPATH=/src/src/dashboard/:/src/src/archivematicaCommon/ +ENV PYTHONPATH=/src/src/dashboard/:/src/src/common/ # ----------------------------------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 3e8f052aa7..5f736612a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ norecursedirs = ".svn _build tmp* node_modules bower_components share .tox" [tool.coverage.run] omit = [ - "**/src/archivematicaCommon/externals/*", + "**/src/common/externals/*", "**/migrations/*", "**/south_migrations/*", "**/management/commands/*", @@ -15,7 +15,7 @@ omit = [ "**/manage.py", ] include = [ - "**/src/archivematicaCommon/*", + "**/src/common/*", "**/src/dashboard/*", "**/src/MCPClient/*", "**/src/MCPServer/*", @@ -55,7 +55,7 @@ warn_unused_configs = true [[tool.mypy.overrides]] module = [ - "src.archivematicaCommon.executeOrRunSubProcess", + "src.common.executeOrRunSubProcess", "src.MCPClient.client.*", "src.MCPClient.clientScripts.characterize_file", "src.MCPClient.clientScripts.has_packages", @@ -64,7 +64,7 @@ module = [ "src.MCPClient.clientScripts.policy_check", "src.MCPClient.clientScripts.transcribe_file", "src.MCPClient.clientScripts.validate_file", - "tests.archivematicaCommon.test_execute_functions", + "tests.common.test_execute_functions", "tests.dashboard.fpr.test_views", "tests.dashboard.test_oidc", "tests.integration.test_oidc_auth", @@ -118,7 +118,7 @@ legacy_tox_ini = """ SRC_DIR = {toxinidir}/src HACK_DIR = {toxinidir}/hack # Archivematica Common - ARCHIVEMATICA_COMMON_DIR = {env:SRC_DIR}/archivematicaCommon + ARCHIVEMATICA_COMMON_DIR = {env:SRC_DIR}/common # Dashboard DASHBOARD_DIR = {env:SRC_DIR}/dashboard DASHBOARD_PYTHONPATH = {env:DASHBOARD_DIR}:{env:ARCHIVEMATICA_COMMON_DIR} @@ -145,7 +145,7 @@ legacy_tox_ini = """ # dependencies in the tox host linting: HOME = {temp_dir}/user changedir = - archivematica-common: {toxinidir}/tests/archivematicaCommon + archivematica-common: {toxinidir}/tests/common dashboard: {toxinidir}/tests/dashboard mcp-server: {toxinidir}/tests/MCPServer mcp-client: {toxinidir}/tests/MCPClient diff --git a/src/MCPClient/clientScripts/bind_pids.py b/src/MCPClient/clientScripts/bind_pids.py index e0973d0287..3e840f3b8c 100755 --- a/src/MCPClient/clientScripts/bind_pids.py +++ b/src/MCPClient/clientScripts/bind_pids.py @@ -173,7 +173,7 @@ def _bind_pid_to_model(job, mdl, shared_path, config): """Binds a PID (Handle persistent identifier) to the (SIP or Directory) model ``mdl`` by making a request to a Handle web service endpoint, given the configuration in ``config`` (which is configured in a dashboard form). - Uses ``bind_pid`` from the bindpid.py module in archivematicaCommon. If + Uses ``bind_pid`` from the bindpid.py module in common. If successful, adds the PID to the model's ``identifiers`` attribute. """ is_sip = isinstance(mdl, SIP) diff --git a/src/MCPClient/install/README.md b/src/MCPClient/install/README.md index f42f080578..271f6b2268 100644 --- a/src/MCPClient/install/README.md +++ b/src/MCPClient/install/README.md @@ -62,7 +62,7 @@ code: (see [`the example`](./clientConfig.conf)) MCPClient will look for a configuration file in one of two locations: -- `/etc/archivematica/archivematicaCommon/dbsettings` +- `/etc/archivematica/common/dbsettings` - `/etc/archivematica/MCPClient/clientConfig.conf` Traditionally, the dbsettings file was used to hold mysql login credentials, diff --git a/src/MCPClient/settings/common.py b/src/MCPClient/settings/common.py index dab115af11..6a9b13bec1 100644 --- a/src/MCPClient/settings/common.py +++ b/src/MCPClient/settings/common.py @@ -273,7 +273,7 @@ def workers(config, section): config.read_defaults(StringIO(CONFIG_DEFAULTS)) config.read_files( [ - "/etc/archivematica/archivematicaCommon/dbsettings", + "/etc/archivematica/common/dbsettings", "/etc/archivematica/MCPClient/clientConfig.conf", ] ) diff --git a/src/MCPServer/install/README.md b/src/MCPServer/install/README.md index bb090070fa..2dc601f189 100644 --- a/src/MCPServer/install/README.md +++ b/src/MCPServer/install/README.md @@ -61,7 +61,7 @@ code: (see [`the example`](./serverConfig.conf)) MCPClient will look for a configuration file in one of two locations: -- `/etc/archivematica/archivematicaCommon/dbsettings` +- `/etc/archivematica/common/dbsettings` - `/etc/archivematica/MCPServer/serverConfig.conf` Traditionally, the dbsettings file was used to hold mysql login credentials, diff --git a/src/MCPServer/settings/common.py b/src/MCPServer/settings/common.py index a6e62ff000..0c502fb457 100644 --- a/src/MCPServer/settings/common.py +++ b/src/MCPServer/settings/common.py @@ -181,7 +181,7 @@ config.read_defaults(StringIO(CONFIG_DEFAULTS)) config.read_files( [ - "/etc/archivematica/archivematicaCommon/dbsettings", + "/etc/archivematica/common/dbsettings", "/etc/archivematica/MCPServer/serverConfig.conf", ] ) diff --git a/src/archivematicaCommon/externals/fiwalk_plugins/ficonfig.txt b/src/archivematicaCommon/externals/fiwalk_plugins/ficonfig.txt deleted file mode 100644 index 9546270ae9..0000000000 --- a/src/archivematicaCommon/externals/fiwalk_plugins/ficonfig.txt +++ /dev/null @@ -1,5 +0,0 @@ -# -# Configuration file for fiwalk -# - -* dgi python /usr/lib/archivematica/archivematicaCommon/externals/fiwalk_plugins/pronom_ident.py diff --git a/src/archivematicaCommon/README.txt b/src/common/README.txt similarity index 100% rename from src/archivematicaCommon/README.txt rename to src/common/README.txt diff --git a/src/archivematicaCommon/__init__.py b/src/common/__init__.py similarity index 100% rename from src/archivematicaCommon/__init__.py rename to src/common/__init__.py diff --git a/src/archivematicaCommon/appconfig.py b/src/common/appconfig.py similarity index 100% rename from src/archivematicaCommon/appconfig.py rename to src/common/appconfig.py diff --git a/src/archivematicaCommon/archivematicaFunctions.py b/src/common/archivematicaFunctions.py similarity index 100% rename from src/archivematicaCommon/archivematicaFunctions.py rename to src/common/archivematicaFunctions.py diff --git a/src/archivematicaCommon/bag.py b/src/common/bag.py similarity index 100% rename from src/archivematicaCommon/bag.py rename to src/common/bag.py diff --git a/src/archivematicaCommon/bindpid.py b/src/common/bindpid.py similarity index 100% rename from src/archivematicaCommon/bindpid.py rename to src/common/bindpid.py diff --git a/src/archivematicaCommon/common_metrics.py b/src/common/common_metrics.py similarity index 100% rename from src/archivematicaCommon/common_metrics.py rename to src/common/common_metrics.py diff --git a/src/archivematicaCommon/countryCodes.py b/src/common/countryCodes.py similarity index 100% rename from src/archivematicaCommon/countryCodes.py rename to src/common/countryCodes.py diff --git a/src/archivematicaCommon/custom_handlers.py b/src/common/custom_handlers.py similarity index 100% rename from src/archivematicaCommon/custom_handlers.py rename to src/common/custom_handlers.py diff --git a/src/archivematicaCommon/databaseFunctions.py b/src/common/databaseFunctions.py similarity index 100% rename from src/archivematicaCommon/databaseFunctions.py rename to src/common/databaseFunctions.py diff --git a/src/archivematicaCommon/dbconns.py b/src/common/dbconns.py similarity index 100% rename from src/archivematicaCommon/dbconns.py rename to src/common/dbconns.py diff --git a/src/archivematicaCommon/dicts.py b/src/common/dicts.py similarity index 100% rename from src/archivematicaCommon/dicts.py rename to src/common/dicts.py diff --git a/src/archivematicaCommon/elasticSearchFunctions.py b/src/common/elasticSearchFunctions.py similarity index 100% rename from src/archivematicaCommon/elasticSearchFunctions.py rename to src/common/elasticSearchFunctions.py diff --git a/src/archivematicaCommon/email_settings.py b/src/common/email_settings.py similarity index 100% rename from src/archivematicaCommon/email_settings.py rename to src/common/email_settings.py diff --git a/src/archivematicaCommon/env_configparser.py b/src/common/env_configparser.py similarity index 100% rename from src/archivematicaCommon/env_configparser.py rename to src/common/env_configparser.py diff --git a/src/archivematicaCommon/executeOrRunSubProcess.py b/src/common/executeOrRunSubProcess.py similarity index 100% rename from src/archivematicaCommon/executeOrRunSubProcess.py rename to src/common/executeOrRunSubProcess.py diff --git a/src/archivematicaCommon/externals/HTML/HTML.py b/src/common/externals/HTML/HTML.py similarity index 100% rename from src/archivematicaCommon/externals/HTML/HTML.py rename to src/common/externals/HTML/HTML.py diff --git a/src/archivematicaCommon/externals/HTML/Licence_CeCILL_V2-en.html b/src/common/externals/HTML/Licence_CeCILL_V2-en.html similarity index 100% rename from src/archivematicaCommon/externals/HTML/Licence_CeCILL_V2-en.html rename to src/common/externals/HTML/Licence_CeCILL_V2-en.html diff --git a/src/archivematicaCommon/externals/HTML/Licence_CeCILL_V2-fr.html b/src/common/externals/HTML/Licence_CeCILL_V2-fr.html similarity index 100% rename from src/archivematicaCommon/externals/HTML/Licence_CeCILL_V2-fr.html rename to src/common/externals/HTML/Licence_CeCILL_V2-fr.html diff --git a/src/archivematicaCommon/externals/HTML/__init__.py b/src/common/externals/HTML/__init__.py similarity index 100% rename from src/archivematicaCommon/externals/HTML/__init__.py rename to src/common/externals/HTML/__init__.py diff --git a/src/archivematicaCommon/externals/__init__.py b/src/common/externals/__init__.py similarity index 100% rename from src/archivematicaCommon/externals/__init__.py rename to src/common/externals/__init__.py diff --git a/src/archivematicaCommon/externals/extractMaildirAttachments.py b/src/common/externals/extractMaildirAttachments.py similarity index 100% rename from src/archivematicaCommon/externals/extractMaildirAttachments.py rename to src/common/externals/extractMaildirAttachments.py diff --git a/src/archivematicaCommon/externals/fido/archivematica_format_extensions.xml b/src/common/externals/fido/archivematica_format_extensions.xml similarity index 100% rename from src/archivematicaCommon/externals/fido/archivematica_format_extensions.xml rename to src/common/externals/fido/archivematica_format_extensions.xml diff --git a/src/common/externals/fiwalk_plugins/ficonfig.txt b/src/common/externals/fiwalk_plugins/ficonfig.txt new file mode 100644 index 0000000000..34de4a801d --- /dev/null +++ b/src/common/externals/fiwalk_plugins/ficonfig.txt @@ -0,0 +1,5 @@ +# +# Configuration file for fiwalk +# + +* dgi python /usr/lib/archivematica/common/externals/fiwalk_plugins/pronom_ident.py diff --git a/src/archivematicaCommon/externals/fiwalk_plugins/pronom_ident.py b/src/common/externals/fiwalk_plugins/pronom_ident.py similarity index 100% rename from src/archivematicaCommon/externals/fiwalk_plugins/pronom_ident.py rename to src/common/externals/fiwalk_plugins/pronom_ident.py diff --git a/src/archivematicaCommon/externals/maildirToMbox.py b/src/common/externals/maildirToMbox.py similarity index 100% rename from src/archivematicaCommon/externals/maildirToMbox.py rename to src/common/externals/maildirToMbox.py diff --git a/src/archivematicaCommon/externals/xmltodict.py b/src/common/externals/xmltodict.py similarity index 100% rename from src/archivematicaCommon/externals/xmltodict.py rename to src/common/externals/xmltodict.py diff --git a/src/archivematicaCommon/fileOperations.py b/src/common/fileOperations.py similarity index 100% rename from src/archivematicaCommon/fileOperations.py rename to src/common/fileOperations.py diff --git a/src/archivematicaCommon/gearman_encoder.py b/src/common/gearman_encoder.py similarity index 100% rename from src/archivematicaCommon/gearman_encoder.py rename to src/common/gearman_encoder.py diff --git a/src/archivematicaCommon/identifier_functions.py b/src/common/identifier_functions.py similarity index 100% rename from src/archivematicaCommon/identifier_functions.py rename to src/common/identifier_functions.py diff --git a/src/archivematicaCommon/namespaces.py b/src/common/namespaces.py similarity index 100% rename from src/archivematicaCommon/namespaces.py rename to src/common/namespaces.py diff --git a/src/archivematicaCommon/processing.py b/src/common/processing.py similarity index 100% rename from src/archivematicaCommon/processing.py rename to src/common/processing.py diff --git a/src/archivematicaCommon/storageService.py b/src/common/storageService.py similarity index 100% rename from src/archivematicaCommon/storageService.py rename to src/common/storageService.py diff --git a/src/archivematicaCommon/version.py b/src/common/version.py similarity index 100% rename from src/archivematicaCommon/version.py rename to src/common/version.py diff --git a/src/archivematicaCommon/xml2obj.py b/src/common/xml2obj.py similarity index 100% rename from src/archivematicaCommon/xml2obj.py rename to src/common/xml2obj.py diff --git a/src/dashboard/components/administration/forms.py b/src/dashboard/components/administration/forms.py index e28be8c02f..c99a0f5e6e 100644 --- a/src/dashboard/components/administration/forms.py +++ b/src/dashboard/components/administration/forms.py @@ -57,7 +57,7 @@ class HandleForm(SettingsForm): directories, as well as the resolution of URLs based on those PIDs, i.e., PURLs, to specified URLs. Note: the attributes of this form are (and must remain) identical to - archivematicaCommon/bindpid::CFGABLE_PARAMS. + common/bindpid::CFGABLE_PARAMS. """ pid_web_service_endpoint = forms.URLField( diff --git a/src/dashboard/install/README.md b/src/dashboard/install/README.md index 9245b47563..b0e8879de9 100644 --- a/src/dashboard/install/README.md +++ b/src/dashboard/install/README.md @@ -64,7 +64,7 @@ of these settings or provide values to mandatory fields. The Dashboard will look for a configuration file in one location: -- `/etc/archivematica/archivematicaCommon/dbsettings` +- `/etc/archivematica/common/dbsettings` Traditionally, the dbsettings file was used to hold mysql login credentials, which are then shared with other Archivematica components like MCPClient. diff --git a/src/dashboard/main/migrations/0041_bind_pids.py b/src/dashboard/main/migrations/0041_bind_pids.py index 9e5eda2069..8636209221 100644 --- a/src/dashboard/main/migrations/0041_bind_pids.py +++ b/src/dashboard/main/migrations/0041_bind_pids.py @@ -23,7 +23,7 @@ def data_migration(apps, schema_editor): PID---generally the UUID of the entity---is passed during handle creation.) That the PURL (i.e., PID's URL) may be configured to resolve to different external (resolve) URLs depending on the qualifier (GET query - parameter) that is appended to it. See archivematicaCommon/bindpid.py + parameter) that is appended to it. See common/bindpid.py for more details. """ diff --git a/src/dashboard/settings/base.py b/src/dashboard/settings/base.py index 462cb75175..d6e03166d7 100644 --- a/src/dashboard/settings/base.py +++ b/src/dashboard/settings/base.py @@ -248,7 +248,7 @@ def _get_settings_from_file(path): config = Config(env_prefix="ARCHIVEMATICA_DASHBOARD", attrs=CONFIG_MAPPING) config.read_defaults(StringIO(CONFIG_DEFAULTS)) -config.read_files(["/etc/archivematica/archivematicaCommon/dbsettings"]) +config.read_files(["/etc/archivematica/common/dbsettings"]) path_of_this_file = os.path.abspath(os.path.dirname(__file__)) diff --git a/tests/archivematicaCommon/fixtures/agents.json b/tests/common/fixtures/agents.json similarity index 100% rename from tests/archivematicaCommon/fixtures/agents.json rename to tests/common/fixtures/agents.json diff --git a/tests/archivematicaCommon/fixtures/test-identifiers-MODS-METS.xml b/tests/common/fixtures/test-identifiers-MODS-METS.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test-identifiers-MODS-METS.xml rename to tests/common/fixtures/test-identifiers-MODS-METS.xml diff --git a/tests/archivematicaCommon/fixtures/test-identifiers-islandora-METS.xml b/tests/common/fixtures/test-identifiers-islandora-METS.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test-identifiers-islandora-METS.xml rename to tests/common/fixtures/test-identifiers-islandora-METS.xml diff --git a/tests/archivematicaCommon/fixtures/test_database_functions.json b/tests/common/fixtures/test_database_functions.json similarity index 100% rename from tests/archivematicaCommon/fixtures/test_database_functions.json rename to tests/common/fixtures/test_database_functions.json diff --git a/tests/archivematicaCommon/fixtures/test_index_aip_and_files_METS.xml b/tests/common/fixtures/test_index_aip_and_files_METS.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test_index_aip_and_files_METS.xml rename to tests/common/fixtures/test_index_aip_and_files_METS.xml diff --git a/tests/archivematicaCommon/fixtures/test_index_aipfile_dmdsec_METS_dconly.xml b/tests/common/fixtures/test_index_aipfile_dmdsec_METS_dconly.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test_index_aipfile_dmdsec_METS_dconly.xml rename to tests/common/fixtures/test_index_aipfile_dmdsec_METS_dconly.xml diff --git a/tests/archivematicaCommon/fixtures/test_index_aipfile_dmdsec_METS_mixed.xml b/tests/common/fixtures/test_index_aipfile_dmdsec_METS_mixed.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test_index_aipfile_dmdsec_METS_mixed.xml rename to tests/common/fixtures/test_index_aipfile_dmdsec_METS_mixed.xml diff --git a/tests/archivematicaCommon/fixtures/test_index_fileuuid_METS_premisv2.xml b/tests/common/fixtures/test_index_fileuuid_METS_premisv2.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test_index_fileuuid_METS_premisv2.xml rename to tests/common/fixtures/test_index_fileuuid_METS_premisv2.xml diff --git a/tests/archivematicaCommon/fixtures/test_index_fileuuid_METS_premisv2_no_ns.xml b/tests/common/fixtures/test_index_fileuuid_METS_premisv2_no_ns.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test_index_fileuuid_METS_premisv2_no_ns.xml rename to tests/common/fixtures/test_index_fileuuid_METS_premisv2_no_ns.xml diff --git a/tests/archivematicaCommon/fixtures/test_index_fileuuid_METS_premisv3.xml b/tests/common/fixtures/test_index_fileuuid_METS_premisv3.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test_index_fileuuid_METS_premisv3.xml rename to tests/common/fixtures/test_index_fileuuid_METS_premisv3.xml diff --git a/tests/archivematicaCommon/fixtures/test_index_metadata-METS-utf8.xml b/tests/common/fixtures/test_index_metadata-METS-utf8.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test_index_metadata-METS-utf8.xml rename to tests/common/fixtures/test_index_metadata-METS-utf8.xml diff --git a/tests/archivematicaCommon/fixtures/test_index_metadata-METS.xml b/tests/common/fixtures/test_index_metadata-METS.xml similarity index 100% rename from tests/archivematicaCommon/fixtures/test_index_metadata-METS.xml rename to tests/common/fixtures/test_index_metadata-METS.xml diff --git a/tests/archivematicaCommon/test_appconfig.py b/tests/common/test_appconfig.py similarity index 100% rename from tests/archivematicaCommon/test_appconfig.py rename to tests/common/test_appconfig.py diff --git a/tests/archivematicaCommon/test_archivematica_functions.py b/tests/common/test_archivematica_functions.py similarity index 100% rename from tests/archivematicaCommon/test_archivematica_functions.py rename to tests/common/test_archivematica_functions.py diff --git a/tests/archivematicaCommon/test_bindpid.py b/tests/common/test_bindpid.py similarity index 100% rename from tests/archivematicaCommon/test_bindpid.py rename to tests/common/test_bindpid.py diff --git a/tests/archivematicaCommon/test_database_functions.py b/tests/common/test_database_functions.py similarity index 100% rename from tests/archivematicaCommon/test_database_functions.py rename to tests/common/test_database_functions.py diff --git a/tests/archivematicaCommon/test_dicts.py b/tests/common/test_dicts.py similarity index 100% rename from tests/archivematicaCommon/test_dicts.py rename to tests/common/test_dicts.py diff --git a/tests/archivematicaCommon/test_elasticsearch_functions.py b/tests/common/test_elasticsearch_functions.py similarity index 100% rename from tests/archivematicaCommon/test_elasticsearch_functions.py rename to tests/common/test_elasticsearch_functions.py diff --git a/tests/archivematicaCommon/test_env_configparser.py b/tests/common/test_env_configparser.py similarity index 100% rename from tests/archivematicaCommon/test_env_configparser.py rename to tests/common/test_env_configparser.py diff --git a/tests/archivematicaCommon/test_execute_functions.py b/tests/common/test_execute_functions.py similarity index 100% rename from tests/archivematicaCommon/test_execute_functions.py rename to tests/common/test_execute_functions.py diff --git a/tests/archivematicaCommon/test_file_operations.py b/tests/common/test_file_operations.py similarity index 100% rename from tests/archivematicaCommon/test_file_operations.py rename to tests/common/test_file_operations.py diff --git a/tests/archivematicaCommon/test_gearman_encoder.py b/tests/common/test_gearman_encoder.py similarity index 100% rename from tests/archivematicaCommon/test_gearman_encoder.py rename to tests/common/test_gearman_encoder.py diff --git a/tests/archivematicaCommon/test_identifier_functions.py b/tests/common/test_identifier_functions.py similarity index 100% rename from tests/archivematicaCommon/test_identifier_functions.py rename to tests/common/test_identifier_functions.py diff --git a/tests/archivematicaCommon/test_storage_service.py b/tests/common/test_storage_service.py similarity index 100% rename from tests/archivematicaCommon/test_storage_service.py rename to tests/common/test_storage_service.py