From f5aceb5447deed25234c5354b9dd9601115d9378 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 18 Nov 2019 20:16:49 +0100 Subject: Forbid multipart upload if google storage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Google Storage doesn't support S3 multipart uploads https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html https://cloud.google.com/storage/docs/composite-objects 5 * 1024 ** 5 is the multipart upload limit. https://docs.aws.amazon.com/AmazonS3/latest/dev/qfacts.html Change-Id: Iec3a5cd70ea6e912272ea231eecde6ee4f51ce4f Signed-off-by: Cédric Ollivier --- xtesting/tests/unit/core/test_testcase.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'xtesting/tests/unit/core/test_testcase.py') diff --git a/xtesting/tests/unit/core/test_testcase.py b/xtesting/tests/unit/core/test_testcase.py index 5d34c34d..80e9d8cf 100644 --- a/xtesting/tests/unit/core/test_testcase.py +++ b/xtesting/tests/unit/core/test_testcase.py @@ -400,15 +400,18 @@ class TestCaseTesting(unittest.TestCase): mock.call().Bucket().upload_file( '/var/lib/xtesting/results/xtesting.log', 'prefix/xtesting.log', + Config=mock.ANY, ExtraArgs={'ContentType': 'application/octet-stream'}), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( '/var/lib/xtesting/results/xtesting.debug.log', 'prefix/xtesting.debug.log', + Config=mock.ANY, ExtraArgs={'ContentType': 'application/octet-stream'}), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( '/var/lib/xtesting/results/bar', 'prefix/bar', + Config=mock.ANY, ExtraArgs={'ContentType': 'application/octet-stream'})] self.assertEqual(args[1].mock_calls, expected) @@ -429,15 +432,18 @@ class TestCaseTesting(unittest.TestCase): mock.call().Bucket().upload_file( '/var/lib/xtesting/results/xtesting.log', 'prefix/xtesting.log', + Config=mock.ANY, ExtraArgs={'ContentType': 'text/plain'}), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( '/var/lib/xtesting/results/xtesting.debug.log', 'prefix/xtesting.debug.log', + Config=mock.ANY, ExtraArgs={'ContentType': 'text/plain'}), mock.call().Bucket('xtesting'), mock.call().Bucket().upload_file( '/var/lib/xtesting/results/bar', 'prefix/bar', + Config=mock.ANY, ExtraArgs={'ContentType': 'text/plain'})] self.assertEqual(args[1].mock_calls, expected) -- cgit 1.2.3-korg