mirror of
https://github.com/ceph/ceph
synced 2025-04-11 04:02:04 +00:00
qa/tasks: drop python2 support from rgw related tests
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
parent
b36f98d388
commit
24e7acc261
qa/tasks
@ -1,11 +1,10 @@
|
|||||||
"""
|
"""
|
||||||
Deploy and configure Tempest for Teuthology
|
Deploy and configure Tempest for Teuthology
|
||||||
"""
|
"""
|
||||||
|
import configparser
|
||||||
import contextlib
|
import contextlib
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from six.moves import configparser
|
|
||||||
|
|
||||||
from teuthology import misc as teuthology
|
from teuthology import misc as teuthology
|
||||||
from teuthology import contextutil
|
from teuthology import contextutil
|
||||||
from teuthology.exceptions import ConfigError
|
from teuthology.exceptions import ConfigError
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
import six
|
from unittest.mock import Mock
|
||||||
if six.PY3:
|
|
||||||
from unittest.mock import Mock
|
|
||||||
else:
|
|
||||||
from mock import Mock
|
|
||||||
|
|
||||||
from tasks import radosgw_admin
|
from tasks import radosgw_admin
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ import logging
|
|||||||
import json
|
import json
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from six import StringIO
|
from io import StringIO
|
||||||
|
|
||||||
from teuthology import misc as teuthology
|
from teuthology import misc as teuthology
|
||||||
|
|
||||||
|
@ -8,8 +8,8 @@ import logging
|
|||||||
import time
|
import time
|
||||||
import json
|
import json
|
||||||
from os import path
|
from os import path
|
||||||
from six.moves import http_client
|
from http import client as http_client
|
||||||
from six.moves.urllib.parse import urljoin
|
from urllib.parse import urljoin
|
||||||
|
|
||||||
from teuthology import misc as teuthology
|
from teuthology import misc as teuthology
|
||||||
from teuthology import contextutil
|
from teuthology import contextutil
|
||||||
|
Loading…
Reference in New Issue
Block a user