From: Owen Synge <osynge@suse.com>
Date: Wed, 10 Aug 2016 14:56:48 +0000 (+0200)
Subject: [RM-16979] Change use of check function.
X-Git-Tag: v1.5.35~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9114c04860d9485822e5daa570025398682c495;p=ceph-deploy.git

[RM-16979] Change use of check function.

Check function should be testable in same way as run function.

Signed-off-by: Owen Synge <osynge@suse.com>
---

diff --git a/ceph_deploy/util/pkg_managers.py b/ceph_deploy/util/pkg_managers.py
index 69cabd6..bc20eb1 100644
--- a/ceph_deploy/util/pkg_managers.py
+++ b/ceph_deploy/util/pkg_managers.py
@@ -24,6 +24,13 @@ class PackageManager(object):
             **kw
         )
 
+    def _check(self, cmd, **kw):
+        return remoto.process.check(
+            self.remote_conn,
+            cmd,
+            **kw
+        )
+
     def install(self, packages, **kw):
         """Install packages on remote node"""
         raise NotImplementedError()
@@ -306,8 +313,7 @@ class Zypper(PackageManager):
                 extra_flags = [extra_flags]
             cmd.extend(extra_flags)
         cmd.extend(packages)
-        stdout, stderr, exitrc = remoto.process.check(
-            self.remote_conn,
+        stdout, stderr, exitrc = self._check(
             cmd,
             **kw
         )