From 7ddcfae7ff8a20fac21f5ba2b923e8e5cbce19e5 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 7 Nov 2019 00:29:38 +0100 Subject: Create Bucket if it doesn't exist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xtesting Ansible Role no longer creates bucket after starting Minio [1]. [1] https://github.com/collivier/ansible-role-xtesting/commit/8c62525bb0d0b5f8dcc2c4436711d5d075de8811 Change-Id: I1ad473ce55f9c00df8e558fdc67f571ee0a1875c Signed-off-by: Cédric Ollivier --- xtesting/tests/unit/core/test_testcase.py | 35 ++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'xtesting/tests') diff --git a/xtesting/tests/unit/core/test_testcase.py b/xtesting/tests/unit/core/test_testcase.py index eff64d5a..3dbbac2c 100644 --- a/xtesting/tests/unit/core/test_testcase.py +++ b/xtesting/tests/unit/core/test_testcase.py @@ -339,6 +339,25 @@ class TestCaseTesting(unittest.TestCase): args[0].assert_called_once_with( 's3', endpoint_url=os.environ['S3_ENDPOINT_URL']) + @mock.patch('boto3.resource') + def test_publish_artifacts_exc4(self, *args): + args[0].return_value.meta.client.head_bucket.side_effect = Exception + self.assertEqual(self.test.publish_artifacts(), + testcase.TestCase.EX_PUBLISH_ARTIFACTS_ERROR) + args[0].assert_called_once_with( + 's3', endpoint_url=os.environ['S3_ENDPOINT_URL']) + + @mock.patch('boto3.resource') + def test_publish_artifacts_exc5(self, *args): + error_response = {'Error': {'Code': '403'}} + mock_head_bucket = args[0].return_value.meta.client.head_bucket + mock_head_bucket.side_effect = botocore.exceptions.ClientError( + error_response, 'Foo') + self.assertEqual(self.test.publish_artifacts(), + testcase.TestCase.EX_PUBLISH_ARTIFACTS_ERROR) + args[0].assert_called_once_with( + 's3', endpoint_url=os.environ['S3_ENDPOINT_URL']) + @mock.patch('boto3.resource') @mock.patch('os.walk', return_value=[]) def test_publish_artifacts1(self, *args): @@ -348,16 +367,30 @@ class TestCaseTesting(unittest.TestCase): args[1].assert_called_once_with( 's3', endpoint_url=os.environ['S3_ENDPOINT_URL']) + @mock.patch('boto3.resource') + @mock.patch('os.walk', return_value=[]) + def test_publish_artifacts2(self, *args): + error_response = {'Error': {'Code': '404'}} + mock_head_bucket = args[1].return_value.meta.client.head_bucket + mock_head_bucket.side_effect = botocore.exceptions.ClientError( + error_response, 'NoSuchBucket') + self.assertEqual(self.test.publish_artifacts(), + testcase.TestCase.EX_OK) + args[0].assert_called_once_with(self.test.dir_results) + args[1].assert_called_once_with( + 's3', endpoint_url=os.environ['S3_ENDPOINT_URL']) + @mock.patch('boto3.resource') @mock.patch('os.walk', return_value=[ (testcase.TestCase.dir_results, ('',), ('bar',))]) - def test_publish_artifacts2(self, *args): + def test_publish_artifacts3(self, *args): self.assertEqual(self.test.publish_artifacts(), testcase.TestCase.EX_OK) args[0].assert_called_once_with(self.test.dir_results) expected = [ mock.call('s3', endpoint_url=os.environ['S3_ENDPOINT_URL']), + mock.call().meta.client.head_bucket(Bucket='xtesting'), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( '/var/lib/xtesting/results/bar', 'prefix/bar')] -- cgit 1.2.3-korg