Make Upload related classes more generic

Renames Python classes that refer to Upload to something to FileService.
We added this change because these classes now handle downloading as
well as uploading.
This commit is contained in:
graham-dds 2020-01-30 13:39:33 -05:00 committed by leigh-mil
parent a7770d8a6a
commit e32e211966
3 changed files with 10 additions and 10 deletions

View File

@ -1,5 +1,5 @@
from .cloud import MockCloudProvider
from .file_uploads import AzureUploader, MockUploader
from .files import AzureFileService, MockFileService
from .reports import MockReportingProvider
@ -11,14 +11,14 @@ class MockCSP:
with_failure=(not test_mode),
with_authorization=(not test_mode),
)
self.files = MockUploader(app)
self.files = MockFileService(app)
self.reports = MockReportingProvider()
class AzureCSP:
def __init__(self, app):
self.cloud = MockCloudProvider(app.config)
self.files = AzureUploader(app.config)
self.files = AzureFileService(app.config)
self.reports = MockReportingProvider()

View File

@ -2,7 +2,7 @@ from datetime import datetime, timedelta
from uuid import uuid4
class Uploader:
class FileService:
def generate_token(self):
raise NotImplementedError()
@ -16,7 +16,7 @@ class Uploader:
raise NotImplementedError()
class MockUploader(Uploader):
class MockFileService(FileService):
def __init__(self, config):
self.config = config
@ -34,7 +34,7 @@ class MockUploader(Uploader):
}
class AzureUploader(Uploader):
class AzureFileService(FileService):
def __init__(self, config):
self.account_name = config["AZURE_ACCOUNT_NAME"]
self.storage_key = config["AZURE_STORAGE_KEY"]

View File

@ -1,4 +1,4 @@
from atst.domain.csp.file_uploads import AzureUploader
from atst.domain.csp.files import AzureFileService
from azure.storage.blob.models import Blob
@ -14,9 +14,9 @@ class MockBlockBlobService(object):
def test_download_task_order_success(app, monkeypatch):
uploader = AzureUploader(config=app.config)
uploader.BlockBlobService = MockBlockBlobService
file_service = AzureFileService(config=app.config)
file_service.BlockBlobService = MockBlockBlobService
task_order = uploader.download_task_order("test.pdf")
task_order = file_service.download_task_order("test.pdf")
assert task_order["name"] == "test.pdf"
assert task_order["content"] == b"mock content"