Remove unused boto3 imports and related patches in test files

Author: peterkle

test/test_cloud_store_api/test_s3_uploader.py

@@ -63,14 +63,12 @@ def test_invalid_directory(self):
         assert_raises(RuntimeError, validate_directory, 'hello$world')
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.set_contents_from_file')
     def test_upload_from_string(self, set_contents):
         with patch.dict(self.flask_app.config, self.default_config):
             url = s3_upload_from_string('bucket', 'hello world', 'test.txt')
             assert url == 'https://s3.storage.com:443/bucket/test.txt', url
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.set_contents_from_file')
     def test_upload_from_string_util(self, set_contents):
         with patch.dict(self.flask_app.config, self.util_config):
             """Test -util keyword dropped from meta url returned from s3 upload."""
@@ -85,15 +83,13 @@ def test_upload_from_string_exception(self, open):
                       'bucket', 'hellow world', 'test.txt')
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.set_contents_from_file')
     def test_upload_from_string_return_key(self, set_contents):
         with patch.dict(self.flask_app.config, self.default_config):
             key = s3_upload_from_string('bucket', 'hello world', 'test.txt',
                                         return_key_only=True)
             assert key == 'test.txt', key
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.set_contents_from_file')
     def test_upload_from_storage(self, set_contents):
         with patch.dict(self.flask_app.config, self.default_config):
             stream = BytesIO(b'Hello world!')
@@ -104,31 +100,26 @@ def test_upload_from_storage(self, set_contents):
             assert url == 'https://s3.storage.com:443/bucket/test.txt', url
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.set_contents_from_file')
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.generate_url')
     def test_upload_remove_query_params(self, generate_url, set_content):
         with patch.dict(self.flask_app.config, self.default_config):
             generate_url.return_value = 'https://s3.storage.com/bucket/key?query_1=aaaa&query_2=bbbb'
             url = s3_upload_file('bucket', 'a_file', 'a_file', {}, 'dev')
             assert url == 'https://s3.storage.com/bucket/key'
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.bucket.Bucket.delete_key')
     def test_delete_file_from_s3(self, delete_key):
         with patch.dict(self.flask_app.config, self.default_config):
             delete_file_from_s3('test_bucket', '/the/key')
             delete_key.assert_called_with('/the/key', headers={}, version_id=None)
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.get_contents_as_string')
     def test_get_file_from_s3(self, get_contents):
         get_contents.return_value = 'abcd'
         with patch.dict(self.flask_app.config, self.default_config):
             get_file_from_s3('test_bucket', '/the/key')
             get_contents.assert_called()
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.get_contents_as_string')
     def test_decrypts_file_from_s3(self, get_contents):
         config = self.default_config.copy()
         config['FILE_ENCRYPTION_KEY'] = 'abcd'

test/test_web.py

@@ -37,7 +37,6 @@
 from pybossa.util import get_user_signup_method, unicode_csv_reader
 from bs4 import BeautifulSoup
 from requests.exceptions import ConnectionError
-import boto3
 from pybossa.model.project import Project
 from pybossa.model.category import Category
 from pybossa.model.task import Task
@@ -8486,7 +8485,6 @@ def test_task_gold(self):
         assert not t.expiration
 
     @with_context
-    @patch('pybossa.cloud_store_api.s3.boto.s3.key.Key.set_contents_from_file')
     def test_task_gold_with_files_in_form(self, set_content):
         """Test WEB when making a task gold with files"""