mirror of
https://github.com/ceph/ceph
synced 2026-08-02 07:03:18 +00:00
qa: import CommandFailedError from exceptions not run
Stop importing CommandFailedError from teuthology.orchestra.run, it is actually defined in teuthology.exception. Fixes: https://tracker.ceph.com/issues/51226 Signed-off-by: Rishabh Dave <ridave@redhat.com>
This commit is contained in:
parent
ca491043d8
commit
485841b255
@ -3,7 +3,7 @@ import unittest
|
||||
import time
|
||||
import logging
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from tasks.mgr.mgr_test_case import MgrCluster
|
||||
|
||||
@ -9,7 +9,7 @@ from tasks.ceph_test_case import CephTestCase
|
||||
|
||||
from teuthology import contextutil
|
||||
from teuthology.orchestra import run
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ from textwrap import dedent
|
||||
from teuthology.contextutil import MaxWhileTries
|
||||
from teuthology.contextutil import safe_while
|
||||
from teuthology.orchestra import run
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from tasks.ceph_manager import get_valgrind_args
|
||||
from tasks.cephfs.mount import CephFSMount
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ import re
|
||||
from io import StringIO
|
||||
from textwrap import dedent
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from teuthology.orchestra import run
|
||||
from teuthology.contextutil import MaxWhileTries
|
||||
|
||||
|
||||
@ -14,7 +14,8 @@ from IPy import IP
|
||||
from teuthology.contextutil import safe_while
|
||||
from teuthology.misc import get_file, write_file
|
||||
from teuthology.orchestra import run
|
||||
from teuthology.orchestra.run import CommandFailedError, ConnectionLostError, Raw
|
||||
from teuthology.orchestra.run import Raw
|
||||
from teuthology.exceptions import CommandFailedError, ConnectionLostError
|
||||
|
||||
from tasks.cephfs.filesystem import Filesystem
|
||||
|
||||
|
||||
@ -6,7 +6,8 @@ import uuid
|
||||
from io import StringIO
|
||||
from os.path import join as os_path_join
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError, Raw
|
||||
from teuthology.orchestra.run import Raw
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
from tasks.cephfs.filesystem import FileLayout, FSMissing
|
||||
|
||||
@ -6,7 +6,7 @@ Exercise the MDS's auto repair functions
|
||||
import logging
|
||||
import time
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ from tempfile import mkstemp as tempfile_mkstemp
|
||||
import math
|
||||
from time import sleep
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ import re
|
||||
import os
|
||||
|
||||
from teuthology.orchestra import run
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from tasks.cephfs.fuse_mount import FuseMount
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
from teuthology.packaging import get_package_version
|
||||
|
||||
@ -13,7 +13,7 @@ from io import BytesIO, StringIO
|
||||
from collections import namedtuple, defaultdict
|
||||
from textwrap import dedent
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase, for_teuthology
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@ -3,7 +3,7 @@ import random
|
||||
import time
|
||||
from tasks.cephfs.fuse_mount import FuseMount
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ from collections import namedtuple
|
||||
from io import BytesIO
|
||||
from textwrap import dedent
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
|
||||
import struct
|
||||
|
||||
@ -7,7 +7,7 @@ try:
|
||||
except:
|
||||
# make it work for python2
|
||||
pass
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from tasks.cephfs.fuse_mount import FuseMount
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ from io import StringIO
|
||||
|
||||
from tasks.cephfs.fuse_mount import FuseMount
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
import errno
|
||||
import time
|
||||
import json
|
||||
|
||||
@ -8,7 +8,7 @@ from os.path import join as os_path_join
|
||||
# CapsHelper is subclassed from CephFSTestCase
|
||||
from tasks.cephfs.caps_helper import CapsHelper
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@ -2,7 +2,7 @@ import logging
|
||||
import errno
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
from teuthology.contextutil import safe_while
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ import logging
|
||||
import traceback
|
||||
from collections import namedtuple
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@ -4,7 +4,8 @@ import signal
|
||||
from textwrap import dedent
|
||||
from tasks.cephfs.fuse_mount import FuseMount
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase
|
||||
from teuthology.orchestra.run import CommandFailedError, Raw
|
||||
from teuthology.orchestra.run import Raw
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@ -5,7 +5,8 @@ from textwrap import dedent
|
||||
import datetime
|
||||
import gevent
|
||||
|
||||
from teuthology.orchestra.run import CommandFailedError, Raw
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from teuthology.orchestra.run import Raw
|
||||
from tasks.cephfs.cephfs_test_case import CephFSTestCase, for_teuthology
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@ -5,7 +5,7 @@ import contextlib
|
||||
import logging
|
||||
|
||||
from teuthology.misc import deep_merge
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from teuthology import misc
|
||||
from teuthology.contextutil import MaxWhileTries
|
||||
from tasks.cephfs.kernel_mount import KernelMount
|
||||
|
||||
@ -5,7 +5,8 @@ import contextlib
|
||||
import time
|
||||
from tasks import ceph_manager
|
||||
from teuthology import misc
|
||||
from teuthology.orchestra.run import CommandFailedError, Raw
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from teuthology.orchestra.run import Raw
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@ -56,7 +56,7 @@ from teuthology.orchestra.remote import Remote
|
||||
from teuthology.config import config as teuth_config
|
||||
from teuthology.contextutil import safe_while
|
||||
from teuthology.contextutil import MaxWhileTries
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
try:
|
||||
import urllib3
|
||||
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
||||
|
||||
@ -12,7 +12,7 @@ from tasks.util.workunit import get_refspec_after_overrides
|
||||
|
||||
from teuthology import misc
|
||||
from teuthology.config import config as teuth_config
|
||||
from teuthology.orchestra.run import CommandFailedError
|
||||
from teuthology.exceptions import CommandFailedError
|
||||
from teuthology.parallel import parallel
|
||||
from teuthology.orchestra import run
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user