From b6d3e275474993b5cc3cd7f15a7e8353792c2f28 Mon Sep 17 00:00:00 2001 From: Javed Habib Date: Sat, 18 May 2024 18:17:42 +0530 Subject: [PATCH] chore: rename to --- pyproject.toml | 4 +- tesk/{service => services}/README.md | 0 tesk/{service => services}/__init__.py | 0 tesk/{service => services}/constants.py | 0 tesk/{service => services}/exceptions.py | 0 tesk/{service => services}/filer.py | 10 ++-- tesk/{service => services}/filer_class.py | 4 +- tesk/{service => services}/filer_s3.py | 2 +- tesk/{service => services}/job.py | 4 +- tesk/{service => services}/path.py | 2 +- tesk/{service => services}/pvc.py | 4 +- tesk/{service => services}/taskmaster.py | 6 +-- tesk/{service => services}/transput.py | 0 tesk/{service => services}/utils.py | 0 .../FilerClassTest.py | 12 ++--- .../TaskMasterTest.py | 12 ++--- .../assertThrows.py | 0 .../resources/copyDirTest/dst1/3.txt | 0 .../resources/copyDirTest/dst1/a/1.txt | 0 .../resources/copyDirTest/dst1/a/2.txt | 0 .../resources/copyDirTest/dst2/3.txt | 0 .../resources/copyDirTest/dst2/a/1.txt | 0 .../resources/copyDirTest/dst2/a/2.txt | 0 .../resources/copyDirTest/src/3.txt | 0 .../resources/copyDirTest/src/a/1.txt | 0 .../resources/copyDirTest/src/a/2.txt | 0 .../resources/inputFile.json | 0 .../resources/test_config | 0 .../test_filer.py | 36 +++++++-------- .../test_filer_ftp_pytest.py | 2 +- .../test_filer_general_pytest.py | 4 +- .../test_filer_http_pytest.py | 4 +- .../test_job.py | 20 ++++---- .../test_s3_filer.py | 12 ++--- .../test_taskmaster.py | 46 +++++++++---------- 35 files changed, 92 insertions(+), 92 deletions(-) rename tesk/{service => services}/README.md (100%) rename tesk/{service => services}/__init__.py (100%) rename tesk/{service => services}/constants.py (100%) rename tesk/{service => services}/exceptions.py (100%) rename tesk/{service => services}/filer.py (98%) rename tesk/{service => services}/filer_class.py (98%) rename tesk/{service => services}/filer_s3.py (98%) rename tesk/{service => services}/job.py (96%) rename tesk/{service => services}/path.py (95%) rename tesk/{service => services}/pvc.py (94%) rename tesk/{service => services}/taskmaster.py (98%) rename tesk/{service => services}/transput.py (100%) rename tesk/{service => services}/utils.py (100%) rename tests/test_unit/{test_service => test_services}/FilerClassTest.py (90%) rename tests/test_unit/{test_service => test_services}/TaskMasterTest.py (81%) rename tests/test_unit/{test_service => test_services}/assertThrows.py (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/dst1/3.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/dst1/a/1.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/dst1/a/2.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/dst2/3.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/dst2/a/1.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/dst2/a/2.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/src/3.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/src/a/1.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/copyDirTest/src/a/2.txt (100%) rename tests/test_unit/{test_service => test_services}/resources/inputFile.json (100%) rename tests/test_unit/{test_service => test_services}/resources/test_config (100%) rename tests/test_unit/{test_service => test_services}/test_filer.py (87%) rename tests/test_unit/{test_service => test_services}/test_filer_ftp_pytest.py (96%) rename tests/test_unit/{test_service => test_services}/test_filer_general_pytest.py (89%) rename tests/test_unit/{test_service => test_services}/test_filer_http_pytest.py (93%) rename tests/test_unit/{test_service => test_services}/test_job.py (95%) rename tests/test_unit/{test_service => test_services}/test_s3_filer.py (95%) rename tests/test_unit/{test_service => test_services}/test_taskmaster.py (77%) diff --git a/pyproject.toml b/pyproject.toml index a7e01b18..5d3c726c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,8 +17,8 @@ classifiers = [ ] [tool.poetry.scripts] -filer = 'tesk.service.filer:main' -taskmaster = 'tesk.service.taskmaster:main' +filer = 'tesk.services.filer:main' +taskmaster = 'tesk.services.taskmaster:main' [tool.poetry.dependencies] python = "^3.11" diff --git a/tesk/service/README.md b/tesk/services/README.md similarity index 100% rename from tesk/service/README.md rename to tesk/services/README.md diff --git a/tesk/service/__init__.py b/tesk/services/__init__.py similarity index 100% rename from tesk/service/__init__.py rename to tesk/services/__init__.py diff --git a/tesk/service/constants.py b/tesk/services/constants.py similarity index 100% rename from tesk/service/constants.py rename to tesk/services/constants.py diff --git a/tesk/service/exceptions.py b/tesk/services/exceptions.py similarity index 100% rename from tesk/service/exceptions.py rename to tesk/services/exceptions.py diff --git a/tesk/service/filer.py b/tesk/services/filer.py similarity index 98% rename from tesk/service/filer.py rename to tesk/services/filer.py index 0a18a414..54e3328d 100755 --- a/tesk/service/filer.py +++ b/tesk/services/filer.py @@ -15,15 +15,15 @@ import requests -from tesk.service.constants import TIMEOUT -from tesk.service.exceptions import ( +from tesk.services.constants import TIMEOUT +from tesk.services.exceptions import ( FileProtocolDisabled, ServiceStatusCodes, UnknownProtocol, ) -from tesk.service.filer_s3 import S3Transput -from tesk.service.path import containerPath, fileEnabled, getPath -from tesk.service.transput import Transput, Type, urlparse +from tesk.services.filer_s3 import S3Transput +from tesk.services.path import containerPath, fileEnabled, getPath +from tesk.services.transput import Transput, Type, urlparse class HTTPTransput(Transput): diff --git a/tesk/service/filer_class.py b/tesk/services/filer_class.py similarity index 98% rename from tesk/service/filer_class.py rename to tesk/services/filer_class.py index 6d222219..8b87657c 100644 --- a/tesk/service/filer_class.py +++ b/tesk/services/filer_class.py @@ -1,7 +1,7 @@ import json -from tesk.service import path -from tesk.service.path import fileEnabled +from tesk.services import path +from tesk.services.path import fileEnabled class Filer: diff --git a/tesk/service/filer_s3.py b/tesk/services/filer_s3.py similarity index 98% rename from tesk/service/filer_s3.py rename to tesk/services/filer_s3.py index ea5f1e43..11451787 100644 --- a/tesk/service/filer_s3.py +++ b/tesk/services/filer_s3.py @@ -6,7 +6,7 @@ import boto3 import botocore -from tesk.service.transput import Transput, Type +from tesk.services.transput import Transput, Type class S3Transput(Transput): diff --git a/tesk/service/job.py b/tesk/services/job.py similarity index 96% rename from tesk/service/job.py rename to tesk/services/job.py index 4e3bad4d..2de163cb 100644 --- a/tesk/service/job.py +++ b/tesk/services/job.py @@ -5,8 +5,8 @@ from kubernetes import client from kubernetes.client.exceptions import ApiException -from tesk.service.exceptions import ServiceStatusCodes -from tesk.service.utils import pprint +from tesk.services.exceptions import ServiceStatusCodes +from tesk.services.utils import pprint logging.basicConfig(format='%(message)s', level=logging.INFO) diff --git a/tesk/service/path.py b/tesk/services/path.py similarity index 95% rename from tesk/service/path.py rename to tesk/services/path.py index 29d1a66c..4dee35e3 100644 --- a/tesk/service/path.py +++ b/tesk/services/path.py @@ -2,7 +2,7 @@ from os.path import relpath from urllib.parse import urlparse -from tesk.service.exceptions import InvalidHostPath +from tesk.services.exceptions import InvalidHostPath def getEnv(varName): diff --git a/tesk/service/pvc.py b/tesk/services/pvc.py similarity index 94% rename from tesk/service/pvc.py rename to tesk/services/pvc.py index 727954d1..07733580 100644 --- a/tesk/service/pvc.py +++ b/tesk/services/pvc.py @@ -4,8 +4,8 @@ from kubernetes import client from kubernetes.client.exceptions import ApiException -from tesk.service.exceptions import ServiceStatusCodes -from tesk.service.utils import pprint +from tesk.services.exceptions import ServiceStatusCodes +from tesk.services.utils import pprint class PVC: diff --git a/tesk/service/taskmaster.py b/tesk/services/taskmaster.py similarity index 98% rename from tesk/service/taskmaster.py rename to tesk/services/taskmaster.py index 1c32360b..a89a8d4c 100755 --- a/tesk/service/taskmaster.py +++ b/tesk/services/taskmaster.py @@ -10,9 +10,9 @@ from kubernetes import config -from tesk.service.filer_class import Filer -from tesk.service.job import Job -from tesk.service.pvc import PVC +from tesk.services.filer_class import Filer +from tesk.services.job import Job +from tesk.services.pvc import PVC created_jobs = [] poll_interval = 5 diff --git a/tesk/service/transput.py b/tesk/services/transput.py similarity index 100% rename from tesk/service/transput.py rename to tesk/services/transput.py diff --git a/tesk/service/utils.py b/tesk/services/utils.py similarity index 100% rename from tesk/service/utils.py rename to tesk/services/utils.py diff --git a/tests/test_unit/test_service/FilerClassTest.py b/tests/test_unit/test_services/FilerClassTest.py similarity index 90% rename from tests/test_unit/test_service/FilerClassTest.py rename to tests/test_unit/test_services/FilerClassTest.py index 3639b713..9ba1f351 100644 --- a/tests/test_unit/test_service/FilerClassTest.py +++ b/tests/test_unit/test_services/FilerClassTest.py @@ -1,9 +1,9 @@ import os import unittest -from tesk.service import path -from tesk.service.filer_class import Filer -from tesk.service.utils import pprint +from tesk.services import path +from tesk.services.filer_class import Filer +from tesk.services.utils import pprint try: from unittest.mock import patch # Python 3 @UnresolvedImport @@ -11,9 +11,9 @@ from unittest.mock import patch -@patch('tesk.service.path.HOST_BASE_PATH', '/home/tfga/workspace/cwl-tes') -@patch('tesk.service.path.CONTAINER_BASE_PATH', '/transfer') -@patch('tesk.service.path.TRANSFER_PVC_NAME', 'transfer-pvc') +@patch('tesk.services.path.HOST_BASE_PATH', '/home/tfga/workspace/cwl-tes') +@patch('tesk.services.path.CONTAINER_BASE_PATH', '/transfer') +@patch('tesk.services.path.TRANSFER_PVC_NAME', 'transfer-pvc') @patch.dict( os.environ, { diff --git a/tests/test_unit/test_service/TaskMasterTest.py b/tests/test_unit/test_services/TaskMasterTest.py similarity index 81% rename from tests/test_unit/test_service/TaskMasterTest.py rename to tests/test_unit/test_services/TaskMasterTest.py index 0cec78c7..b8c93a65 100644 --- a/tests/test_unit/test_service/TaskMasterTest.py +++ b/tests/test_unit/test_services/TaskMasterTest.py @@ -4,7 +4,7 @@ from argparse import Namespace from unittest.mock import patch -from tesk.service.taskmaster import newLogger, newParser, run_task +from tesk.services.taskmaster import newLogger, newParser, run_task def pvcCreateMock(self): @@ -74,13 +74,13 @@ def test_pullPolicyAlways(self): ) @patch( - 'tesk.service.taskmaster.args', + 'tesk.services.taskmaster.args', Namespace(debug=True, namespace='default', pull_policy_always=True), ) - @patch('tesk.service.taskmaster.logger', newLogger(logging.DEBUG)) - @patch('tesk.service.taskmaster.PVC.create', pvcCreateMock) - @patch('tesk.service.taskmaster.PVC.delete', pvcDeleteMock) - @patch('tesk.service.taskmaster.Job.run_to_completion', jobRunToCompletionMock) + @patch('tesk.services.taskmaster.logger', newLogger(logging.DEBUG)) + @patch('tesk.services.taskmaster.PVC.create', pvcCreateMock) + @patch('tesk.services.taskmaster.PVC.delete', pvcDeleteMock) + @patch('tesk.services.taskmaster.Job.run_to_completion', jobRunToCompletionMock) def test_run_task(self): with open('tests/resources/inputFile.json') as fh: data = json.load(fh) diff --git a/tests/test_unit/test_service/assertThrows.py b/tests/test_unit/test_services/assertThrows.py similarity index 100% rename from tests/test_unit/test_service/assertThrows.py rename to tests/test_unit/test_services/assertThrows.py diff --git a/tests/test_unit/test_service/resources/copyDirTest/dst1/3.txt b/tests/test_unit/test_services/resources/copyDirTest/dst1/3.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/dst1/3.txt rename to tests/test_unit/test_services/resources/copyDirTest/dst1/3.txt diff --git a/tests/test_unit/test_service/resources/copyDirTest/dst1/a/1.txt b/tests/test_unit/test_services/resources/copyDirTest/dst1/a/1.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/dst1/a/1.txt rename to tests/test_unit/test_services/resources/copyDirTest/dst1/a/1.txt diff --git a/tests/test_unit/test_service/resources/copyDirTest/dst1/a/2.txt b/tests/test_unit/test_services/resources/copyDirTest/dst1/a/2.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/dst1/a/2.txt rename to tests/test_unit/test_services/resources/copyDirTest/dst1/a/2.txt diff --git a/tests/test_unit/test_service/resources/copyDirTest/dst2/3.txt b/tests/test_unit/test_services/resources/copyDirTest/dst2/3.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/dst2/3.txt rename to tests/test_unit/test_services/resources/copyDirTest/dst2/3.txt diff --git a/tests/test_unit/test_service/resources/copyDirTest/dst2/a/1.txt b/tests/test_unit/test_services/resources/copyDirTest/dst2/a/1.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/dst2/a/1.txt rename to tests/test_unit/test_services/resources/copyDirTest/dst2/a/1.txt diff --git a/tests/test_unit/test_service/resources/copyDirTest/dst2/a/2.txt b/tests/test_unit/test_services/resources/copyDirTest/dst2/a/2.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/dst2/a/2.txt rename to tests/test_unit/test_services/resources/copyDirTest/dst2/a/2.txt diff --git a/tests/test_unit/test_service/resources/copyDirTest/src/3.txt b/tests/test_unit/test_services/resources/copyDirTest/src/3.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/src/3.txt rename to tests/test_unit/test_services/resources/copyDirTest/src/3.txt diff --git a/tests/test_unit/test_service/resources/copyDirTest/src/a/1.txt b/tests/test_unit/test_services/resources/copyDirTest/src/a/1.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/src/a/1.txt rename to tests/test_unit/test_services/resources/copyDirTest/src/a/1.txt diff --git a/tests/test_unit/test_service/resources/copyDirTest/src/a/2.txt b/tests/test_unit/test_services/resources/copyDirTest/src/a/2.txt similarity index 100% rename from tests/test_unit/test_service/resources/copyDirTest/src/a/2.txt rename to tests/test_unit/test_services/resources/copyDirTest/src/a/2.txt diff --git a/tests/test_unit/test_service/resources/inputFile.json b/tests/test_unit/test_services/resources/inputFile.json similarity index 100% rename from tests/test_unit/test_service/resources/inputFile.json rename to tests/test_unit/test_services/resources/inputFile.json diff --git a/tests/test_unit/test_service/resources/test_config b/tests/test_unit/test_services/resources/test_config similarity index 100% rename from tests/test_unit/test_service/resources/test_config rename to tests/test_unit/test_services/resources/test_config diff --git a/tests/test_unit/test_service/test_filer.py b/tests/test_unit/test_services/test_filer.py similarity index 87% rename from tests/test_unit/test_service/test_filer.py rename to tests/test_unit/test_services/test_filer.py index afe6192e..729a2591 100644 --- a/tests/test_unit/test_service/test_filer.py +++ b/tests/test_unit/test_services/test_filer.py @@ -6,12 +6,12 @@ from fs.opener import open_fs -from tesk.service.exceptions import ( +from tesk.services.exceptions import ( FileProtocolDisabled, InvalidHostPath, UnknownProtocol, ) -from tesk.service.filer import ( +from tesk.services.filer import ( FileTransput, FTPTransput, HTTPTransput, @@ -23,9 +23,9 @@ process_file, subfolders_in, ) -from tesk.service.filer_s3 import S3Transput -from tesk.service.path import containerPath -from tests.test_unit.test_service.assertThrows import AssertThrowsMixin +from tesk.services.filer_s3 import S3Transput +from tesk.services.path import containerPath +from tests.test_unit.test_services.assertThrows import AssertThrowsMixin def getTree(rootDir): @@ -41,15 +41,15 @@ def stripLines(txt): return '\n'.join([line.strip() for line in txt.splitlines()[1:]]) -@patch('tesk.service.path.HOST_BASE_PATH', '/home/tfga/workspace/cwl-tes') -@patch('tesk.service.path.CONTAINER_BASE_PATH', '/transfer') +@patch('tesk.services.path.HOST_BASE_PATH', '/home/tfga/workspace/cwl-tes') +@patch('tesk.services.path.CONTAINER_BASE_PATH', '/transfer') class FilerTest(unittest.TestCase, AssertThrowsMixin): @classmethod def setUpClass(cls): logConfig(logging.DEBUG) # Doesn't work... - @patch('tesk.service.filer.copyDir') - @patch('tesk.service.filer.shutil.copy') + @patch('tesk.services.filer.copyDir') + @patch('tesk.services.filer.shutil.copy') def test_download_file(self, copyMock, copyDirMock): filedata = { 'url': 'file:///home/tfga/workspace/cwl-tes/tmphrtip1o8/md5', @@ -69,8 +69,8 @@ def test_download_file(self, copyMock, copyDirMock): '/var/lib/cwl/stgda974802-fa81-4f0b-' '8fe4-341d5655af4b/md5', ) - @patch('tesk.service.filer.copyDir') - @patch('tesk.service.filer.shutil.copy') + @patch('tesk.services.filer.copyDir') + @patch('tesk.services.filer.shutil.copy') def test_download_dir(self, copyMock, copyDirMock): filedata = { 'url': 'file:///home/tfga/workspace/cwl-tes/tmphrtip1o8/', @@ -85,8 +85,8 @@ def test_download_dir(self, copyMock, copyDirMock): copyDirMock.assert_called_once_with('/transfer/tmphrtip1o8', '/TclSZU') - @patch('tesk.service.filer.copyDir') - @patch('tesk.service.filer.shutil.copy') + @patch('tesk.services.filer.copyDir') + @patch('tesk.services.filer.shutil.copy') def test_upload_dir(self, copyMock, copyDirMock): filedata = { 'url': 'file:///home/tfga/workspace/cwl-tes/tmphrtip1o8/', @@ -101,8 +101,8 @@ def test_upload_dir(self, copyMock, copyDirMock): copyDirMock.assert_called_once_with('/TclSZU', '/transfer/tmphrtip1o8') - @patch('tesk.service.filer.copyDir') - @patch('tesk.service.filer.copyFile') + @patch('tesk.services.filer.copyDir') + @patch('tesk.services.filer.copyFile') def test_upload_file(self, copyFileMock, copyDirMock): filedata = { 'url': 'file:///home/tfga/workspace/cwl-tes/tmphrtip1o8/md5', @@ -117,8 +117,8 @@ def test_upload_file(self, copyFileMock, copyDirMock): copyFileMock.assert_called_once_with('/TclSZU/md5', '/transfer/tmphrtip1o8/md5') - @patch('tesk.service.filer.copyDir') - @patch('tesk.service.filer.copyFile') + @patch('tesk.services.filer.copyDir') + @patch('tesk.services.filer.copyFile') def test_upload_file_glob(self, copyFileMock, copyDirMock): filedata = { 'url': 'file:///home/tfga/workspace/cwl-tes/tmphrtip1o8/md5*', @@ -139,7 +139,7 @@ def test_copyDir(self): def rmDir(d): os.system(f'rm -r {d}') - baseDir = 'tests/test_unit/test_service/resources/copyDirTest/' + baseDir = 'tests/test_unit/test_services/resources/copyDirTest/' src = os.path.join(baseDir, 'src') dst1 = os.path.join(baseDir, 'dst1') dst2 = os.path.join(baseDir, 'dst2') diff --git a/tests/test_unit/test_service/test_filer_ftp_pytest.py b/tests/test_unit/test_services/test_filer_ftp_pytest.py similarity index 96% rename from tests/test_unit/test_service/test_filer_ftp_pytest.py rename to tests/test_unit/test_services/test_filer_ftp_pytest.py index 85fa07b2..c13a88de 100755 --- a/tests/test_unit/test_service/test_filer_ftp_pytest.py +++ b/tests/test_unit/test_services/test_filer_ftp_pytest.py @@ -4,7 +4,7 @@ import os from unittest import mock -from tesk.service.filer import ( +from tesk.services.filer import ( FTPTransput, Type, ftp_check_directory, diff --git a/tests/test_unit/test_service/test_filer_general_pytest.py b/tests/test_unit/test_services/test_filer_general_pytest.py similarity index 89% rename from tests/test_unit/test_service/test_filer_general_pytest.py rename to tests/test_unit/test_services/test_filer_general_pytest.py index f59f05b6..6a6c2002 100755 --- a/tests/test_unit/test_service/test_filer_general_pytest.py +++ b/tests/test_unit/test_services/test_filer_general_pytest.py @@ -7,7 +7,7 @@ import pytest -from tesk.service.filer import FileProtocolDisabled, copyContent, process_file +from tesk.services.filer import FileProtocolDisabled, copyContent, process_file def test_process_file_no_scheme(caplog): @@ -31,7 +31,7 @@ def test_process_file_with_scheme(mocker): 'path': '.', 'type': 'FILE', } - mock_new_Trans = mocker.patch('tesk.service.filer.newTransput') + mock_new_Trans = mocker.patch('tesk.services.filer.newTransput') process_file('inputs', filedata) mock_new_Trans.assert_called_once_with('http', 'www.foo.bar') diff --git a/tests/test_unit/test_service/test_filer_http_pytest.py b/tests/test_unit/test_services/test_filer_http_pytest.py similarity index 93% rename from tests/test_unit/test_service/test_filer_http_pytest.py rename to tests/test_unit/test_services/test_filer_http_pytest.py index ece29182..b4c7c5db 100755 --- a/tests/test_unit/test_service/test_filer_http_pytest.py +++ b/tests/test_unit/test_services/test_filer_http_pytest.py @@ -4,10 +4,10 @@ from requests import Response -from tesk.service.filer import HTTPTransput, Type +from tesk.services.filer import HTTPTransput, Type PATH_DOWN = 'test_download_file.txt' -PATH_UP = 'tests/test_unit/test_service/test_filer_http_pytest.py' +PATH_UP = 'tests/test_unit/test_services/test_filer_http_pytest.py' SUCCESS = 200 FAIL = 300 URL = 'http://www.foo.bar' diff --git a/tests/test_unit/test_service/test_job.py b/tests/test_unit/test_services/test_job.py similarity index 95% rename from tests/test_unit/test_service/test_job.py rename to tests/test_unit/test_services/test_job.py index 1ed88181..66e62e30 100644 --- a/tests/test_unit/test_service/test_job.py +++ b/tests/test_unit/test_services/test_job.py @@ -9,8 +9,8 @@ from dateutil.tz import tzutc from kubernetes.client.rest import ApiException -from tesk.service import taskmaster -from tesk.service.job import Job +from tesk.services import taskmaster +from tesk.services.job import Job START_TIME = datetime.datetime.now(timezone.utc) @@ -210,7 +210,7 @@ def test_job(self): @patch('kubernetes.client.BatchV1Api.create_namespaced_job') @patch( - 'tesk.service.job.Job.get_status', + 'tesk.services.job.Job.get_status', side_effect=[ ('Running', True), ('Running', True), @@ -234,10 +234,10 @@ def test_run_to_completion_success( ) self.assertEqual(status, 'Complete') - @patch('tesk.service.job.Job.delete') - @patch('tesk.service.taskmaster.check_cancelled', return_value=True) + @patch('tesk.services.job.Job.delete') + @patch('tesk.services.taskmaster.check_cancelled', return_value=True) @patch('kubernetes.client.BatchV1Api.create_namespaced_job') - @patch('tesk.service.job.Job.get_status', side_effect=[('Running', True)]) + @patch('tesk.services.job.Job.get_status', side_effect=[('Running', True)]) def test_run_to_completion_cancelled( self, mock_get_status, @@ -258,12 +258,12 @@ def test_run_to_completion_cancelled( ) self.assertEqual(status, 'Cancelled') - @patch('tesk.service.taskmaster.check_cancelled', return_value=False) + @patch('tesk.services.taskmaster.check_cancelled', return_value=False) @patch( 'kubernetes.client.BatchV1Api.create_namespaced_job', side_effect=ApiException(status=409, reason='conflict'), ) - @patch('tesk.service.job.Job.get_status', side_effect=[('Complete', True)]) + @patch('tesk.services.job.Job.get_status', side_effect=[('Complete', True)]) @patch( 'kubernetes.client.BatchV1Api.read_namespaced_job', side_effect=read_namespaced_job_running, @@ -314,8 +314,8 @@ def test_run_to_completion_check_other_K8_exception( 'kubernetes.client.BatchV1Api.read_namespaced_job', side_effect=read_namespaced_job_error, ) - @patch('tesk.service.job.Job.delete') - @patch('tesk.service.taskmaster.check_cancelled', return_value=False) + @patch('tesk.services.job.Job.delete') + @patch('tesk.services.taskmaster.check_cancelled', return_value=False) @patch('kubernetes.client.BatchV1Api.create_namespaced_job') def test_run_to_completion_error( # noqa: PLR0913 self, diff --git a/tests/test_unit/test_service/test_s3_filer.py b/tests/test_unit/test_services/test_s3_filer.py similarity index 95% rename from tests/test_unit/test_service/test_s3_filer.py rename to tests/test_unit/test_services/test_s3_filer.py index c4b273e6..ed34b0ee 100644 --- a/tests/test_unit/test_service/test_s3_filer.py +++ b/tests/test_unit/test_services/test_s3_filer.py @@ -4,10 +4,10 @@ import boto3 import pytest -# from tesk.service.extract_endpoint import extract_endpoint +# from tesk.services.extract_endpoint import extract_endpoint from moto import mock_aws -from tesk.service.filer_s3 import S3Transput +from tesk.services.filer_s3 import S3Transput @pytest.fixture() @@ -71,7 +71,7 @@ def test_check_if_bucket_exists(moto_boto, path, url, ftype, expected): assert trans.check_if_bucket_exists(client) == expected -# @patch('tesk.service.filer.os.makedirs') +# @patch('tesk.services.filer.os.makedirs') # @patch('builtins.open') # @patch('s3transfer.utils.OSUtils.rename_file') @pytest.mark.parametrize( @@ -93,10 +93,10 @@ def test_s3_download_file(moto_boto, path, url, ftype, expected, fs, caplog): # assert os.path.exists(path) is True -@patch('tesk.service.filer.os.makedirs') +@patch('tesk.services.filer.os.makedirs') @patch('builtins.open') @patch('s3transfer.utils.OSUtils.rename_file') -# @patch("tesk.service.filer_s3.extract_endpoint", return_value="http://s3.amazonaws.com") +# @patch("tesk.services.filer_s3.extract_endpoint", return_value="http://s3.amazonaws.com") @pytest.mark.parametrize( 'path, url, ftype,expected', [ @@ -196,7 +196,7 @@ def test_upload_directory_for_unknown_file_type(moto_boto, fs, monkeypatch, capl assert 'Object is neither file or directory' in caplog.text -@patch('tesk.service.filer.os.path.exists', return_value=1) +@patch('tesk.services.filer.os.path.exists', return_value=1) def test_extract_url_from_config_file(mock_path_exists): """ Testing extraction of endpoint url from default file location diff --git a/tests/test_unit/test_service/test_taskmaster.py b/tests/test_unit/test_services/test_taskmaster.py similarity index 77% rename from tests/test_unit/test_service/test_taskmaster.py rename to tests/test_unit/test_services/test_taskmaster.py index 80d97334..7d610535 100644 --- a/tests/test_unit/test_service/test_taskmaster.py +++ b/tests/test_unit/test_services/test_taskmaster.py @@ -6,9 +6,9 @@ from kubernetes.client.rest import ApiException -from tesk.service import taskmaster -from tesk.service.filer_class import Filer -from tesk.service.taskmaster import ( +from tesk.services import taskmaster +from tesk.services.filer_class import Filer +from tesk.services.taskmaster import ( PVC, append_mount, dirname, @@ -58,9 +58,9 @@ def setUp(self): taskmaster.created_jobs = [] - @patch('tesk.service.taskmaster.PVC.create') - @patch('tesk.service.taskmaster.Job.run_to_completion', return_value='Complete') - @patch('tesk.service.taskmaster.logger') + @patch('tesk.services.taskmaster.PVC.create') + @patch('tesk.services.taskmaster.Job.run_to_completion', return_value='Complete') + @patch('tesk.services.taskmaster.logger') def test_pvc_creation(self, mock_logger, mock_run_to_compl, mock_pvc_create): """ Testing to check if the PVC volume was created successfully @@ -86,10 +86,10 @@ def test_create_pvc_check_for_other_exceptions(self, mock_create_namespaced_pvc) with self.assertRaises(ApiException): self.pvc.create() - @patch('tesk.service.taskmaster.PVC.delete') - @patch('tesk.service.taskmaster.PVC.create') - @patch('tesk.service.taskmaster.Job.run_to_completion', return_value='error') - @patch('tesk.service.taskmaster.logger') + @patch('tesk.services.taskmaster.PVC.delete') + @patch('tesk.services.taskmaster.PVC.create') + @patch('tesk.services.taskmaster.Job.run_to_completion', return_value='error') + @patch('tesk.services.taskmaster.logger') def test_pvc_failure( self, mock_logger, run_to_compl, mock_pvc_create, mock_pvc_delete ): @@ -99,10 +99,10 @@ def test_pvc_failure( self.assertRaises(SystemExit, init_pvc, self.data, self.filer) - @patch('tesk.service.taskmaster.PVC.delete') - @patch('tesk.service.taskmaster.Job.delete') - @patch('tesk.service.taskmaster.Job.run_to_completion', return_value='Error') - @patch('tesk.service.taskmaster.logger') + @patch('tesk.services.taskmaster.PVC.delete') + @patch('tesk.services.taskmaster.Job.delete') + @patch('tesk.services.taskmaster.Job.run_to_completion', return_value='Error') + @patch('tesk.services.taskmaster.logger') def test_run_executor_failure( self, mock_logger, mock_run_to_compl, mock_job_delete, mock_pvc_delete ): @@ -114,9 +114,9 @@ def test_run_executor_failure( taskmaster.args.namespace, ) - @patch('tesk.service.taskmaster.PVC') - @patch('tesk.service.taskmaster.Job.run_to_completion', return_value='Complete') - @patch('tesk.service.taskmaster.logger') + @patch('tesk.services.taskmaster.PVC') + @patch('tesk.services.taskmaster.Job.run_to_completion', return_value='Complete') + @patch('tesk.services.taskmaster.logger') def test_run_executor_complete(self, mock_logger, mock_run_to_compl, mock_pvc): """ """ self.assertEqual( @@ -126,12 +126,12 @@ def test_run_executor_complete(self, mock_logger, mock_run_to_compl, mock_pvc): None, ) - @patch('tesk.service.taskmaster.logger') + @patch('tesk.services.taskmaster.logger') def test_generate_mount(self, mock_logger): """ """ self.assertIsInstance(generate_mounts(self.data, self.pvc), list) - @patch('tesk.service.taskmaster.logger') + @patch('tesk.services.taskmaster.logger') def test_append_mount(self, mock_logger): """ """ volume_mounts = [] @@ -150,10 +150,10 @@ def test_append_mount(self, mock_logger): ], ) - @patch('tesk.service.taskmaster.logger') - @patch('tesk.service.taskmaster.PVC.create') - @patch('tesk.service.taskmaster.PVC.delete') - @patch('tesk.service.taskmaster.Job.run_to_completion', return_value='Complete') + @patch('tesk.services.taskmaster.logger') + @patch('tesk.services.taskmaster.PVC.create') + @patch('tesk.services.taskmaster.PVC.delete') + @patch('tesk.services.taskmaster.Job.run_to_completion', return_value='Complete') def test_run_task(self, mock_job, mock_pvc_create, mock_pvc_delete, mock_logger): """ """ run_task(self.data, taskmaster.args.filer_name, taskmaster.args.filer_version)