aboutsummaryrefslogtreecommitdiffstats
path: root/xtesting/tests/unit
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-11-18 20:16:49 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-11-18 20:30:13 +0100
commitf5aceb5447deed25234c5354b9dd9601115d9378 (patch)
tree17c98d855848df7b5409981c9b28a0dfc45116d8 /xtesting/tests/unit
parente2e7dbe185a552b21315063dbbed8ac4f40f309d (diff)
Forbid multipart upload if google storage
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 <cedric.ollivier@orange.com>
Diffstat (limited to 'xtesting/tests/unit')
-rw-r--r--xtesting/tests/unit/core/test_testcase.py6
1 files changed, 6 insertions, 0 deletions
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)