From: Rishabh Dave <ridave@redhat.com>
Date: Thu, 20 Feb 2020 14:43:06 +0000 (+0530)
Subject: qa/cephfs: rewrite a bit of code xfstests_dev.py
X-Git-Tag: v15.1.1~262^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c1dd0a51d8cfbbe2c77b77797c88ba68dd34538;p=ceph.git

qa/cephfs: rewrite a bit of code xfstests_dev.py

The variable storing the major version number plays an important role
while updating deps, therefore use a better name that is more
descriptive and makes spotting thereby easier.

Also, add an explanation for why we we have list of deps for fedora and
remove a redundant line of code.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/qa/tasks/cephfs/xfstests_dev.py b/qa/tasks/cephfs/xfstests_dev.py
index beef3e449552..15ee52ca5e8c 100644
--- a/qa/tasks/cephfs/xfstests_dev.py
+++ b/qa/tasks/cephfs/xfstests_dev.py
@@ -96,10 +96,11 @@ class XFSTestsDev(CephFSTestCase):
         distro, version = get_system_type(self.mount_a.client_remote,
                                           distro=True, version=True)
         distro = distro.lower()
-        version = int(version.split('.')[0]) # only keep major release number
+        major_ver_num = int(version.split('.')[0]) # only keep major release
+                                                   # number
 
-        distro = get_system_type(self.mount_a.client_remote,
-                                 distro=True).lower()
+        # we keep fedora here so that right deps are installed when this test
+        # is run locally by a dev.
         if distro in ('redhatenterpriseserver', 'redhatenterprise', 'fedora',
                       'centos'):
             deps = """acl attr automake bc dbench dump e2fsprogs fio \
@@ -109,7 +110,7 @@ class XFSTestsDev(CephFSTestCase):
             xfsprogs-devel btrfs-progs-devel python2 sqlite""".split()
             deps_old_distros = ['xfsprogs-qa-devel']
 
-            if distro != 'fedora' and version > 7:
+            if distro != 'fedora' and major_ver_num > 7:
                     deps.remove('btrfs-progs-devel')
 
             args = ['sudo', 'yum', 'install', '-y'] + deps + deps_old_distros
@@ -119,7 +120,7 @@ class XFSTestsDev(CephFSTestCase):
             libacl1-dev libaio-dev xfsprogs libgdbm-dev gawk fio dbench \
             uuid-runtime python sqlite3""".split()
 
-            if version >= 19:
+            if major_ver_num >= 19:
                 deps[deps.index('python')] ='python2'
             args = ['sudo', 'apt-get', 'install', '-y'] + deps
         else: