From 92cf18361ab0cc322aab9225114022b683ed4f10 Mon Sep 17 00:00:00 2001
From: Rishabh Dave <ridave@redhat.com>
Date: Tue, 15 Jun 2021 18:10:34 +0530
Subject: [PATCH] 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: https://github.com/ceph/teuthology/pull/1652.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---
 qa/tasks/cephfs/caps_helper.py    | 2 +-
 qa/tasks/cephfs/mount.py          | 3 ++-
 qa/tasks/cephfs/test_admin.py     | 3 ++-
 qa/tasks/cephfs/test_snapshots.py | 3 ++-
 qa/tasks/cephfs/test_strays.py    | 3 ++-
 qa/tasks/mds_creation_failure.py  | 3 ++-
 qa/tasks/vstart_runner.py         | 2 +-
 7 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/qa/tasks/cephfs/caps_helper.py b/qa/tasks/cephfs/caps_helper.py
index e27a3e1b35c674..52b8162b121d04 100644
--- 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
index 3cd07f194786d8..28a90f8893594a 100644
--- 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
index 6a2d63b9a88ad3..32cfbbf51e1047 100644
--- 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
index fa4d9431fefdfa..5bbad7ec9741f2 100644
--- 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
index f8313badd03584..0104dec091c112 100644
--- 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
index 58314086c03375..260a7424b2a6cb 100644
--- 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
index a76601a24dfdbc..13040fdb140586 100644
--- 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