From e4a7262566424c564f667e546a2a4b3aef84b006 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 04:22:08 +0000 Subject: [PATCH] [pre-commit.ci] Apply automatic pre-commit fixes --- .../tests/_internal/worker/test_app.py | 45 +++++++------- conda-store-server/tests/test_storage.py | 61 ++++++++++++------- 2 files changed, 62 insertions(+), 44 deletions(-) diff --git a/conda-store-server/tests/_internal/worker/test_app.py b/conda-store-server/tests/_internal/worker/test_app.py index 5fa8ec738..a1c2b6adb 100644 --- a/conda-store-server/tests/_internal/worker/test_app.py +++ b/conda-store-server/tests/_internal/worker/test_app.py @@ -2,18 +2,19 @@ # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. -import pytest import logging import sys -from traitlets.config import Config - from unittest.mock import patch +import pytest + +from traitlets.config import Config + from conda_store_server._internal.worker.app import CondaStoreWorker -class MockCeleryApp(): +class MockCeleryApp: def worker_main(argv): pass @@ -21,7 +22,7 @@ def worker_main(argv): @pytest.mark.skipif( sys.platform == "win32", reason="celery beat is not supported on windows" ) -@patch('conda_store_server.app.CondaStore.celery_app') +@patch("conda_store_server.app.CondaStore.celery_app") def test_start_worker(mock_celery_app, conda_store_config): """Test that the celery worker is started with the right arguments""" mock_celery_app.return_value = MockCeleryApp() @@ -35,13 +36,15 @@ def test_start_worker(mock_celery_app, conda_store_config): worker = CondaStoreWorker(config=conda_store_config) worker.initialize() worker.start() - mock_celery_app.worker_main.assert_called_with([ - "worker", - "--loglevel=WARNING", - "--max-tasks-per-child=10", - "--beat", - "--concurrency=4" - ]) + mock_celery_app.worker_main.assert_called_with( + [ + "worker", + "--loglevel=WARNING", + "--max-tasks-per-child=10", + "--beat", + "--concurrency=4", + ] + ) def test_initialize_worker_with_valid_config_file(conda_store_config, tmp_path): @@ -64,21 +67,21 @@ def test_initialize_worker_with_valid_config_file(conda_store_config, tmp_path): def test_initialize_worker_with_invalid_config(conda_store_config): """Test that a worker is not able to init if the provided config file does not exist""" worker = CondaStoreWorker(config=conda_store_config) - with pytest.raises(SystemExit) as exc_info: + with pytest.raises(SystemExit) as exc_info: worker.config_file = "/i/dont/exist" worker.initialize() - + assert exc_info.value.code == 1 @pytest.mark.parametrize( - "logging_level,output", - [ - (logging.INFO, "INFO"), - (logging.CRITICAL, "CRITICAL"), - (logging.FATAL, "CRITICAL"), - (logging.WARN, "WARNING"), - ] + "logging_level,output", + [ + (logging.INFO, "INFO"), + (logging.CRITICAL, "CRITICAL"), + (logging.FATAL, "CRITICAL"), + (logging.WARN, "WARNING"), + ], ) def test_logger_to_celery_logging_level(logging_level, output): worker = CondaStoreWorker() diff --git a/conda-store-server/tests/test_storage.py b/conda-store-server/tests/test_storage.py index 34ef8ea7a..1dd3e3a5e 100644 --- a/conda-store-server/tests/test_storage.py +++ b/conda-store-server/tests/test_storage.py @@ -2,9 +2,9 @@ import pytest -from conda_store_server import storage +from conda_store_server import api, storage from conda_store_server._internal import schema -from conda_store_server import api + @pytest.fixture() def local_file_store(tmp_path): @@ -16,7 +16,7 @@ def local_file_store(tmp_path): tf_two = str(tmp_path / "testfile2") with open(tf_two, "w") as file: file.write("testfile2") - + logs_path = tmp_path / "logs" os.mkdir(logs_path) @@ -29,65 +29,80 @@ def test_fset_new_package(self, db): store.fset(db, 123, "new_build_key", "", schema.BuildArtifactType.YAML) assert len(api.list_build_artifacts(db).all()) == 1 - def test_fset_existing_package(self, seed_conda_store): store = storage.Storage() db = seed_conda_store - + inital_artifacts = api.list_build_artifacts(db).all() artifact = inital_artifacts[0] - + store.fset(db, artifact.build_id, artifact.key, "", artifact.artifact_type) assert len(api.list_build_artifacts(db).all()) == len(inital_artifacts) def test_delete_existing_artifact(self, seed_conda_store): store = storage.Storage() db = seed_conda_store - + inital_artifacts = api.list_build_artifacts(db).all() artifact = inital_artifacts[0] - + store.delete(db, artifact.build_id, artifact.key) - assert len(api.list_build_artifacts(db).all()) == len(inital_artifacts)-1 + assert len(api.list_build_artifacts(db).all()) == len(inital_artifacts) - 1 class TestLocalStorage: def test_fset_new_package(self, db, local_file_store): store = storage.LocalStorage() store.storage_path = local_file_store - + filename = str(local_file_store / "testfile1") - store.fset(db, 123, "new_build_key", filename, "contenttype", schema.BuildArtifactType.YAML) + store.fset( + db, + 123, + "new_build_key", + filename, + "contenttype", + schema.BuildArtifactType.YAML, + ) assert len(api.list_build_artifacts(db).all()) == 1 - + target_file = str(local_file_store / "new_build_key") assert os.path.exists(target_file) - target_content = open(target_file, 'r').read() + target_content = open(target_file, "r").read() assert target_content == "testfile1" def test_fset_dont_overwrite_file(self, db, local_file_store): store = storage.LocalStorage() store.storage_path = local_file_store - + filename = str(local_file_store / "testfile1") - store.fset(db, 123, "testfile2", filename, "contenttype", schema.BuildArtifactType.YAML) + store.fset( + db, 123, "testfile2", filename, "contenttype", schema.BuildArtifactType.YAML + ) assert len(api.list_build_artifacts(db).all()) == 1 - + target_file = str(local_file_store / "testfile2") assert os.path.exists(target_file) - target_content = open(target_file, 'r').read() + target_content = open(target_file, "r").read() assert target_content == "testfile1" def test_set_new_package(self, db, local_file_store): store = storage.LocalStorage() store.storage_path = local_file_store - - store.set(db, 123, "new_build_key", b"somestuff", "contenttype", schema.BuildArtifactType.YAML) + + store.set( + db, + 123, + "new_build_key", + b"somestuff", + "contenttype", + schema.BuildArtifactType.YAML, + ) assert len(api.list_build_artifacts(db).all()) == 1 - + target_file = str(local_file_store / "new_build_key") assert os.path.exists(target_file) - target_content = open(target_file, 'r').read() + target_content = open(target_file, "r").read() assert target_content == "somestuff" def test_get(self, local_file_store): @@ -110,6 +125,6 @@ def test_delete(self, seed_conda_store, local_file_store): file.write("testfile2") store.delete(db, artifact.build_id, artifact.key) - assert len(api.list_build_artifacts(db).all()) == len(inital_artifacts)-1 - + assert len(api.list_build_artifacts(db).all()) == len(inital_artifacts) - 1 + assert not os.path.exists(target_file)