test-019: make it PEP8 complaint

Make test 019-cgconfig-uidgid_dperm_fperm.py PEP-8 complaint.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/ftests/019-cgconfig-uidgid_dperm_fperm.py b/ftests/019-cgconfig-uidgid_dperm_fperm.py
index 9f545ad6c3c3dc472fabe92c74f6c26622805ce4..7eccff46eaa60bc97c61077eaf62c81536522997 100755 (executable)
--- a/ftests/019-cgconfig-uidgid_dperm_fperm.py
+++ b/ftests/019-cgconfig-uidgid_dperm_fperm.py
@@ -20,13 +20,14 @@
 # along with this library; if not, see <http://www.gnu.org/licenses>.
 #
 
-from cgroup import Cgroup, CgroupVersion
+from container import ContainerError
+from run import Run, RunError
+from cgroup import Cgroup
 import consts
 import ftests
-import os
-from run import Run
-import sys
 import utils
+import sys
+import os
 
 CONTROLLER = 'cpuset'
 CGNAME = '019cgconfig'
@@ -44,12 +45,14 @@ FPERM = '246'
 
 CONFIG_FILE_NAME = os.path.join(os.getcwd(), '019cgconfig.conf')
 
+
 def prereqs(config):
     result = consts.TEST_PASSED
     cause = None
 
     return result, cause
 
+
 def setup(config):
     f = open(CONFIG_FILE_NAME, 'w')
     f.write(CONFIG_FILE)
@@ -62,6 +65,7 @@ def setup(config):
         Run.run(['sudo', 'useradd', '-p', 'Test019#1', USER])
         Run.run(['sudo', 'groupadd', GROUP])
 
+
 def test(config):
     result = consts.TEST_PASSED
     cause = None
@@ -77,32 +81,41 @@ def test(config):
 
     if user != USER:
         result = consts.TEST_FAILED
-        cause = "Owner name failed.  Expected {}, received {}\n".format(
-                USER, user)
+        cause = (
+                    'Owner name failed.  Expected {}, received {}\n'
+                    ''.format(USER, user)
+                )
         return result, cause
 
     if group != GROUP:
         result = consts.TEST_FAILED
-        cause = "Owner group failed.  Expected {}, received {}\n".format(
-                GROUP, group)
+        cause = (
+                    'Owner group failed.  Expected {}, received {}\n'
+                    ''.format(GROUP, group)
+                )
         return result, cause
 
     fperm = utils.get_file_permissions(config, cpus_path)
     if fperm != FPERM:
         result = consts.TEST_FAILED
-        cause = "File permissions failed.  Expected {}, received {}\n".format(
-                FPERM, fperm)
+        cause = (
+                    'File permissions failed.  Expected {}, received {}\n'
+                    ''.format(FPERM, fperm)
+                )
         return result, cause
 
     dperm = utils.get_file_permissions(config, os.path.join(mnt_path, CGNAME))
     if dperm != DPERM:
         result = consts.TEST_FAILED
-        cause = "Directory permissions failed.  Expected {}, received {}\n".format(
-                DPERM, dperm)
+        cause = (
+                    'Directory permissions failed.  Expected {}, received {}\n'
+                    ''.format(DPERM, dperm)
+                )
         return result, cause
 
     return result, cause
 
+
 def teardown(config):
     os.remove(CONFIG_FILE_NAME)
 
@@ -113,11 +126,12 @@ def teardown(config):
         else:
             Run.run(['sudo', 'userdel', USER])
             Run.run(['sudo', 'groupdel', GROUP])
-    except:
+    except (ContainerError, RunError, ValueError):
         pass
 
     Cgroup.delete(config, CONTROLLER, CGNAME)
 
+
 def main(config):
     [result, cause] = prereqs(config)
     if result != consts.TEST_PASSED:
@@ -131,6 +145,7 @@ def main(config):
 
     return [result, cause]
 
+
 if __name__ == '__main__':
     config = ftests.parse_args()
     # this test was invoked directly.  run only it