Merge pull request #32 from grking8/move-tests

Move tests
grking8 · Feb 10, 2019 · 6f6de4a · 6f6de4a
2 parents f687a01 + d3be2dc
commit 6f6de4a
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 22 deletions.
diff --git a/aiostorage/__init__.py b/aiostorage/__init__.py
@@ -24,7 +24,7 @@
 from .exceptions import (BlobStorageMissingCredentialsError,
                          BlobStorageUnrecognizedProviderError,)
 
-__version__ = '0.1.15'
+__version__ = '0.1.16'
 
 __all__ = ['BlobStorage', 'BlobStorageUnrecognizedProviderError',
            'BlobStorageMissingCredentialsError']
diff --git a/aiostorage/tests/__init__.py b/aiostorage/tests/__init__.py
diff --git a/...ene Fischer - Atemlos durch die Nacht.mp4 → ...ene Fischer - Atemlos durch die Nacht.mp4 b/...ene Fischer - Atemlos durch die Nacht.mp4 → ...ene Fischer - Atemlos durch die Nacht.mp4
diff --git a/...uis Fonsi - Despacito ft Daddy Yankee.mp4 → ...uis Fonsi - Despacito ft Daddy Yankee.mp4 b/...uis Fonsi - Despacito ft Daddy Yankee.mp4 → ...uis Fonsi - Despacito ft Daddy Yankee.mp4
diff --git a/...etano - Ma il cielo è sempre più blu.webm → ...etano - Ma il cielo è sempre più blu.webm b/...etano - Ma il cielo è sempre più blu.webm → ...etano - Ma il cielo è sempre più blu.webm
diff --git a/...data/videos/Stromae - Alors On Danse.webm → ...data/videos/Stromae - Alors On Danse.webm b/...data/videos/Stromae - Alors On Danse.webm → ...data/videos/Stromae - Alors On Danse.webm
diff --git a/aiostorage/tests/providers/__init__.py b/aiostorage/tests/providers/__init__.py
diff --git a/aiostorage/tests/providers/apis/__init__.py b/aiostorage/tests/providers/apis/__init__.py
diff --git a/tests/providers/apis/test_backblaze_api.py → ...ests/providers/apis/test_backblaze_api.py b/tests/providers/apis/test_backblaze_api.py → ...ests/providers/apis/test_backblaze_api.py
@@ -2,9 +2,9 @@
 
 import pytest
 
-from aiostorage.providers.backblaze import Backblaze
+from ....providers.backblaze import Backblaze
 
-VIDEOS_PATH = os.path.join('tests', 'data', 'videos')
+VIDEOS_PATH = os.path.join('aiostorage', 'tests', 'data', 'videos')
 BUCKET_ID = os.environ['BACKBLAZE_TEST_BUCKET_ID']
 
 

diff --git a/tests/providers/test_backblaze.py → aiostorage/tests/providers/test_backblaze.py b/tests/providers/test_backblaze.py → aiostorage/tests/providers/test_backblaze.py
@@ -1,6 +1,6 @@
 import pytest
 
-from aiostorage.providers.backblaze import Backblaze
+from ...providers.backblaze import Backblaze
 
 
 @pytest.fixture

diff --git a/tests/test_blob_storage.py → aiostorage/tests/test_blob_storage.py b/tests/test_blob_storage.py → aiostorage/tests/test_blob_storage.py
@@ -1,12 +1,9 @@
 import asynctest
 import pytest
 
-from aiostorage import (BlobStorage, BlobStorageMissingCredentialsError,
-                        BlobStorageUnrecognizedProviderError, )
-from aiostorage.providers import PROVIDERS
-from aiostorage.providers.backblaze import Backblaze
-from aiostorage.providers.exceptions import (ProviderAuthorizationError,
-                                             ProviderFileUploadError)
+from .. import (BlobStorage, BlobStorageMissingCredentialsError,
+                BlobStorageUnrecognizedProviderError, )
+from ..providers import backblaze, exceptions, PROVIDERS
 
 
 @pytest.fixture
@@ -60,19 +57,21 @@ def fake_provider_upload_file_side_effect(bucket_id, file_to_upload,
 @pytest.fixture
 def mock_provider_authorize(monkeypatch):
     fake_provider_authorize = asynctest.CoroutineMock(
-        Backblaze.authorize,
+        backblaze.Backblaze.authorize,
         side_effect=fake_provider_authorize_side_effect
     )
-    monkeypatch.setattr(Backblaze, 'authorize', fake_provider_authorize)
+    monkeypatch.setattr(
+        backblaze.Backblaze, 'authorize', fake_provider_authorize)
     return fake_provider_authorize
 
 
 @pytest.fixture
 def mock_provider_upload_file(monkeypatch):
     fake_provider_upload_file = asynctest.CoroutineMock(
-        Backblaze.upload_file,
+        backblaze.Backblaze.upload_file,
         side_effect=fake_provider_upload_file_side_effect)
-    monkeypatch.setattr(Backblaze, 'upload_file', fake_provider_upload_file)
+    monkeypatch.setattr(
+        backblaze.Backblaze, 'upload_file', fake_provider_upload_file)
     return fake_provider_upload_file
 
 
@@ -97,11 +96,11 @@ def fake_provider_authorize_error_side_effect():
 @pytest.fixture
 def mock_provider_authorize_error(monkeypatch):
     fake_provider_authorize_error = asynctest.CoroutineMock(
-        Backblaze.authorize,
+        backblaze.Backblaze.authorize,
         side_effect=fake_provider_authorize_error_side_effect
     )
     monkeypatch.setattr(
-        Backblaze, 'authorize', fake_provider_authorize_error)
+        backblaze.Backblaze, 'authorize', fake_provider_authorize_error)
     return fake_provider_authorize_error
 
 
@@ -112,7 +111,7 @@ async def test_upload_file_authorization_error(
 ):
     bucket_id = '3432'
     file_to_upload = {'content_type': 'video/mp4', 'path': 'hello.mp4'}
-    with pytest.raises(ProviderAuthorizationError):
+    with pytest.raises(exceptions.ProviderAuthorizationError):
         await storage.upload_file(bucket_id, file_to_upload)
 
 
@@ -124,11 +123,11 @@ def fake_provider_upload_file_error_side_effect(bucket_id, file_to_upload,
 @pytest.fixture
 def mock_provider_upload_file_error(monkeypatch):
     fake_provider_upload_file_error = asynctest.CoroutineMock(
-        Backblaze.upload_file,
+        backblaze.Backblaze.upload_file,
         side_effect=fake_provider_upload_file_error_side_effect
     )
     monkeypatch.setattr(
-        Backblaze, 'upload_file', fake_provider_upload_file_error)
+        backblaze.Backblaze, 'upload_file', fake_provider_upload_file_error)
     return fake_provider_upload_file_error
 
 
@@ -140,5 +139,5 @@ async def test_upload_file_upload_file_error(
 ):
     bucket_id = '3432'
     file_to_upload = {'content_type': 'video/mp4', 'path': 'hello.mp4'}
-    with pytest.raises(ProviderFileUploadError):
+    with pytest.raises(exceptions.ProviderFileUploadError):
         await storage.upload_file(bucket_id, file_to_upload)
diff --git a/setup.cfg b/setup.cfg
@@ -5,4 +5,4 @@ import-order-style = smarkets
 application-import-names = aiostorage
 
 [tool:pytest]
-addopts = -vv --ignore=tests/providers/apis/ --cov=aiostorage tests/
+addopts = -vv --ignore=aiostorage/tests/providers/apis/ --cov=aiostorage aiostorage/tests/
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
     'asynchronously. The aim is to support multiple object storage '
     'providers, e.g. Google Cloud, Backblaze, etc.'
 )
-version = '0.1.15'
+version = '0.1.16'
 classifiers = [
     'Development Status :: 1 - Planning',