openstack/swift
Code Issues Proposed changes

Merge "tests: boto is always <3.0"

Browse Source
This commit is contained in:
Zuul 2023-09-27 23:41:43 +00:00 committed by Gerrit Code Review
commit 037c0f01a4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/functional/s3api/__init__.py
View File

@ -20,8 +20,6 @@ import logging
from unittest import SkipTest from unittest import SkipTest
import os import os
import boto
from distutils.version import StrictVersion
import test.functional as tf import test.functional as tf
from test.functional.s3api.s3_test_client import ( from test.functional.s3api.s3_test_client import (
@ -112,9 +110,8 @@ class S3ApiBaseBoto3(S3ApiBase):
def skip_boto2_sort_header_bug(m): def skip_boto2_sort_header_bug(m):
def wrapped(self, *args, **kwargs): def wrapped(self, *args, **kwargs):
if (os.environ.get('S3_USE_SIGV4') == "True" and if os.environ.get('S3_USE_SIGV4') == "True":
StrictVersion(boto.__version__) < StrictVersion('3.0')): # boto doesn't sort headers for v4 sigs properly; see
# boto 2 doesn't sort headers properly; see
# https://github.com/boto/boto/pull/3032 # https://github.com/boto/boto/pull/3032
# or https://github.com/boto/boto/pull/3176 # or https://github.com/boto/boto/pull/3176
# or https://github.com/boto/boto/pull/3751 # or https://github.com/boto/boto/pull/3751