mark tests

Author: yokomotod

test/helpers.py

@@ -0,0 +1,24 @@
+def safe_mock_s3(func):
+    """
+    Annotations will be evaluated even if `pytes -m "not s3"` is specified. So
+      ```
+      @pytest.mark.s3
+      class TestS3(unittest.TestCase):
+          @mock_s3
+          def test_foo():
+      ```
+    will raise an error if moto is not installed.
+    This decorator is used to avoid this error.
+    """
+
+    # try:
+    #     from moto import mock_s3
+    #     return mock_s3(func)
+    # except ImportError:
+    #     return func
+    def wrapper(*args, **kwargs):
+        from moto import mock_s3
+        with mock_s3():
+            return func(*args, **kwargs)
+
+    return wrapper

test/test_gcs_config.py

@@ -2,9 +2,15 @@
 import unittest
 from unittest.mock import MagicMock, patch
 
-from gokart.gcs_config import GCSConfig
+import pytest
 
+try:
+    from gokart.gcs_config import GCSConfig
+except ImportError:
+    pass
 
+
+@pytest.mark.gcs
 class TestGCSConfig(unittest.TestCase):
 
     def test_get_gcs_client_without_gcs_credential_name(self):

test/test_s3_config.py

@@ -1,8 +1,14 @@
 import unittest
 
-from gokart.s3_config import S3Config
+import pytest
 
+try:
+    from gokart.s3_config import S3Config
+except ImportError:
+    pass
 
+
+@pytest.mark.s3
 class TestS3Config(unittest.TestCase):
 
     def test_get_same_s3_client(self):

test/test_s3_zip_client.py

@@ -2,22 +2,29 @@
 import shutil
 import unittest
 
-import boto3
-from moto import mock_s3
+import pytest
 
-from gokart.s3_zip_client import S3ZipClient
+from .helpers import safe_mock_s3
+
+try:
+    import boto3
+
+    from gokart.s3_zip_client import S3ZipClient
+except ImportError:
+    pass
 
 
 def _get_temporary_directory():
     return os.path.abspath(os.path.join(os.path.dirname(__name__), 'temporary'))
 
 
+@pytest.mark.s3
 class TestS3ZipClient(unittest.TestCase):
 
     def tearDown(self):
         shutil.rmtree(_get_temporary_directory(), ignore_errors=True)
 
-    @mock_s3
+    @safe_mock_s3
     def test_make_archive(self):
         conn = boto3.resource('s3', region_name='us-east-1')
         conn.create_bucket(Bucket='test')
@@ -34,7 +41,7 @@ def test_make_archive(self):
         os.makedirs(temporary_directory, exist_ok=True)
         zip_client.make_archive()
 
-    @mock_s3
+    @safe_mock_s3
     def test_unpack_archive(self):
         conn = boto3.resource('s3', region_name='us-east-1')
         conn.create_bucket(Bucket='test')

test/test_target.py

@@ -5,15 +5,21 @@
 from datetime import datetime
 from unittest.mock import patch
 
-import boto3
 import numpy as np
 import pandas as pd
+import pytest
 from matplotlib import pyplot
-from moto import mock_s3
 
 from gokart.file_processor import _ChunkedLargeFileReader
 from gokart.target import make_model_target, make_target
 
+from .helpers import safe_mock_s3
+
+try:
+    import boto3
+except:
+    pass
+
 
 def _get_temporary_directory():
     return os.path.abspath(os.path.join(os.path.dirname(__name__), 'temporary'))
@@ -171,9 +177,10 @@ def test_dump_without_lock(self):
             wrap_with_lock_mock.assert_not_called()
 
 
+@pytest.mark.s3
 class S3TargetTest(unittest.TestCase):
 
-    @mock_s3
+    @safe_mock_s3
     def test_save_on_s3(self):
         conn = boto3.resource('s3', region_name='us-east-1')
         conn.create_bucket(Bucket='test')
@@ -187,7 +194,7 @@ def test_save_on_s3(self):
 
         self.assertEqual(loaded, obj)
 
-    @mock_s3
+    @safe_mock_s3
     def test_last_modified_time(self):
         conn = boto3.resource('s3', region_name='us-east-1')
         conn.create_bucket(Bucket='test')
@@ -200,7 +207,7 @@ def test_last_modified_time(self):
         t = target.last_modification_time()
         self.assertIsInstance(t, datetime)
 
-    @mock_s3
+    @safe_mock_s3
     def test_last_modified_time_without_file(self):
         conn = boto3.resource('s3', region_name='us-east-1')
         conn.create_bucket(Bucket='test')
@@ -238,7 +245,8 @@ def test_model_target_on_local(self):
 
         self.assertEqual(loaded, obj)
 
-    @mock_s3
+    @pytest.mark.s3
+    @safe_mock_s3
     def test_model_target_on_s3(self):
         conn = boto3.resource('s3', region_name='us-east-1')
         conn.create_bucket(Bucket='test')