From: Loic Dachary <ldachary@redhat.com>
Date: Sun, 20 Sep 2015 12:54:16 +0000 (+0200)
Subject: tests: ceph-disk: use sh() instead of helper() when possible
X-Git-Tag: v9.1.0~89^2^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4d5153cd46063e4b8d424024e0056afe2dae0aa;p=ceph.git

tests: ceph-disk: use sh() instead of helper() when possible

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/qa/workunits/ceph-disk/ceph-disk-test.py b/qa/workunits/ceph-disk/ceph-disk-test.py
index 88a7287be38e..a2967c653eaf 100644
--- a/qa/workunits/ceph-disk/ceph-disk-test.py
+++ b/qa/workunits/ceph-disk/ceph-disk-test.py
@@ -58,7 +58,7 @@ class CephDisk:
         names = filter(lambda x: re.match(pattern, x), os.listdir("/sys/block"))
         if not names:
             return []
-        disks = json.loads(self.helper("ceph-disk list --format json " + " ".join(names)))
+        disks = json.loads(self.sh("ceph-disk list --format json " + " ".join(names)))
         unused = []
         for disk in disks:
             if 'partitions' not in disk:
@@ -80,7 +80,7 @@ class CephDisk:
         self.sh("rmmod scsi_debug || true")
 
     def get_osd_partition(self, uuid):
-        disks = json.loads(self.helper("ceph-disk list --format json"))
+        disks = json.loads(self.sh("ceph-disk list --format json"))
         for disk in disks:
             if 'partitions' in disk:
                 for partition in disk['partitions']:
@@ -91,7 +91,7 @@ class CephDisk:
     def get_journal_partition(self, uuid):
         data_partition = self.get_osd_partition(uuid)
         journal_dev = data_partition['journal_dev']
-        disks = json.loads(self.helper("ceph-disk list --format json"))
+        disks = json.loads(self.sh("ceph-disk list --format json"))
         for disk in disks:
             if 'partitions' in disk:
                 for partition in disk['partitions']: