summaryrefslogtreecommitdiffstats
path: root/glustolibs-gluster/glustolibs/gluster/mount_ops.py
diff options
context:
space:
mode:
authorVitalii Koriakov <vkoriako@redhat.com>2018-10-26 13:18:28 +0300
committerNigel Babu <nigelb@redhat.com>2018-10-29 09:57:30 +0000
commitc10083a0166969ec5474fd8a92cfd35cf0536ffe (patch)
tree7dd33882f6581988f22a6ec8a0d5934d029b4605 /glustolibs-gluster/glustolibs/gluster/mount_ops.py
parent3d5274169cac77566e6fb1fb2a53d01ca4af1d13 (diff)
Using a raw strings for fixing flake warnings
Change-Id: Ie134790ea05919a4b396657c11cbc3fc7a7fc529 Signed-off-by: Vitalii Koriakov <vkoriako@redhat.com>
Diffstat (limited to 'glustolibs-gluster/glustolibs/gluster/mount_ops.py')
-rwxr-xr-x[-rw-r--r--]glustolibs-gluster/glustolibs/gluster/mount_ops.py21
1 files changed, 9 insertions, 12 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/mount_ops.py b/glustolibs-gluster/glustolibs/gluster/mount_ops.py
index 637af24b1..cc63d0588 100644..100755
--- a/glustolibs-gluster/glustolibs/gluster/mount_ops.py
+++ b/glustolibs-gluster/glustolibs/gluster/mount_ops.py
@@ -251,18 +251,15 @@ def is_mounted(volname, mpoint, mserver, mclient, mtype, user='root'):
if mtype == "smb":
if mpoint == "*":
return False
- else:
- cmd = powershell("net use %s" % mpoint)
- ret, out, err = g.run(mclient, cmd, user)
- if ret != 0:
- return False
- else:
- expected_output = ("Remote name \\\%s\gluster-%s" %
- (mserver, volname))
- if expected_output in out:
- return True
- else:
- return False
+ cmd = powershell("net use %s" % mpoint)
+ ret, out, err = g.run(mclient, cmd, user)
+ if ret != 0:
+ return False
+ expected_output = (r"\\\%s\gluster-%s" %
+ (mserver, volname))
+ if "Remote name" in out and expected_output in out:
+ return True
+ return False
else:
ret, _, _ = g.run(mclient, "mount | grep %s | grep %s | grep \"%s\""
% (volname, mpoint, mserver), user)