qa: import Raw from run_helper instead of run

Class Raw has been moved from teuthology.orchestra.run to teuthology.orchestra.run_helper. Update Ceph QA code accordingly. Related PR: ceph/teuthology#1652. Signed-off-by: Rishabh Dave <[email protected]>
rishabh-d-dave · Jun 15, 2021 · 92cf183 · 92cf183
1 parent fa03786
commit 92cf183
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/qa/tasks/cephfs/caps_helper.py b/qa/tasks/cephfs/caps_helper.py
@@ -3,7 +3,7 @@
 """
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 
-from teuthology.orchestra.run import Raw
+from teuthology.orchestra.run_helper import Raw
 
 class CapsHelper(CephFSTestCase):
 

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
@@ -14,7 +14,8 @@
 from teuthology.contextutil import safe_while
 from teuthology.misc import get_file, sudo_write_file
 from teuthology.orchestra import run
-from teuthology.orchestra.run import CommandFailedError, ConnectionLostError, Raw
+from teuthology.orchestra.run import CommandFailedError, ConnectionLostError
+from teuthology.orchestra.run_helper import Raw
 
 from tasks.cephfs.filesystem import Filesystem
 

diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py
@@ -3,7 +3,8 @@
 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 CommandFailedError
+from teuthology.orchestra.run_helper import Raw
 
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 from tasks.cephfs.filesystem import FileLayout, FSMissing

diff --git a/qa/tasks/cephfs/test_snapshots.py b/qa/tasks/cephfs/test_snapshots.py
@@ -4,7 +4,8 @@
 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 CommandFailedError
+from teuthology.orchestra.run_helper import Raw
 
 log = logging.getLogger(__name__)
 

diff --git a/qa/tasks/cephfs/test_strays.py b/qa/tasks/cephfs/test_strays.py
@@ -5,7 +5,8 @@
 import datetime
 import gevent
 
-from teuthology.orchestra.run import CommandFailedError, Raw
+from teuthology.orchestra.run import CommandFailedError
+from teuthology.orchestra.run_helper import Raw
 from tasks.cephfs.cephfs_test_case import CephFSTestCase, for_teuthology
 
 log = logging.getLogger(__name__)

diff --git a/qa/tasks/mds_creation_failure.py b/qa/tasks/mds_creation_failure.py
@@ -5,7 +5,8 @@
 import time
 from tasks import ceph_manager
 from teuthology import misc
-from teuthology.orchestra.run import CommandFailedError, Raw
+from teuthology.orchestra.run import CommandFailedError
+from teuthology.orchestra.run_helper import Raw
 
 log = logging.getLogger(__name__)
 

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
@@ -51,7 +51,7 @@
 
 from unittest import suite, loader
 
-from teuthology.orchestra.run import Raw, quote
+from teuthology.orchestra.run_helper import Raw, quote
 from teuthology.orchestra.daemon import DaemonGroup
 from teuthology.orchestra.remote import Remote
 from teuthology.config import config as teuth_config