Fix the pep8 error in qtip.py and validate_yaml.py

JIRA:QTIP-89

Change-Id: Ifd760f74601dbc3e4d4c55108ed60a634f33cf49
Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>

diff --git a/func/validate_yaml.py b/func/validate_yaml.py
index e4d3d5c..fcf32a2 100644 (file)
--- a/func/validate_yaml.py
+++ b/func/validate_yaml.py
@@ -1,32 +1,28 @@
-##############################################################################
-# Copyright (c) 2015 Dell Inc  and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-
-
-import yaml
-import os
-
-
-class Validate_Yaml():
-
-    def __init__(self, doc):
-
-        print 'Validating YAML CONFIG FILE'
-
-        if not doc['Scenario']:
-            print '\nScenario Field missing\n'
-        if not doc['Scenario']['benchmark']:
-            print '\nBenchmark field missing'
-        if not doc['Scenario']['pointless']:
-            print ''
-        if not doc['Context']:
-            print '\nEntire Context is missing'
-        if not doc['Context']['Host_Machine']:
-            print '\nNo Host Machine'
-        if not doc['Context']['Host_Machine']['machine_1']
+##############################################################################\r
+# Copyright (c) 2015 Dell Inc  and others.\r
+#\r
+# All rights reserved. This program and the accompanying materials\r
+# are made available under the terms of the Apache License, Version 2.0\r
+# which accompanies this distribution, and is available at\r
+# http://www.apache.org/licenses/LICENSE-2.0\r
+##############################################################################\r
+\r
+\r
+class Validate_Yaml(object):\r
+\r
+    def __init__(self, doc):\r
+\r
+        print('Validating YAML CONFIG FILE')\r
+\r
+        if not doc['Scenario']:\r
+            print('\nScenario Field missing\na')\r
+        if not doc['Scenario']['benchmark']:\r
+            print('\nBenchmark field missing')\r
+        if not doc['Scenario']['pointless']:\r
+            print('')\r
+        if not doc['Context']:\r
+            print('\nEntire Context is missing')\r
+        if not doc['Context']['Host_Machine']:\r
+            print('\nNo Host Machine')\r
+        if not doc['Context']['Host_Machine']['machine_1']:\r
+            print('\nNo Host Machine')\r

diff --git a/qtip.py b/qtip.py
index befbc23..f95bb70 100644 (file)
--- a/qtip.py
+++ b/qtip.py
@@ -1,24 +1,22 @@
-##############################################################################
-# Copyright (c) 2015 Dell Inc  and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-
-
-from func.cli import cli
-import os
-
-def main():
-    os.system('./data/file_permission.sh')
-    Objcli = cli()
-#    os.system('cd data/ref_results && python compute_suite.py')
-#    os.system('cd data/ref_results && python storage_suite.py')
-#    os.system('cd data/ref_results && python network_suite.py')
-#   os.system('cd data/report && python Qtip_Report.py')
-
-if __name__ == "__main__":
-    main()
+##############################################################################\r
+# Copyright (c) 2015 Dell Inc  and others.\r
+#\r
+# All rights reserved. This program and the accompanying materials\r
+# are made available under the terms of the Apache License, Version 2.0\r
+# which accompanies this distribution, and is available at\r
+# http://www.apache.org/licenses/LICENSE-2.0\r
+##############################################################################\r
+from func.cli import cli\r
+import os\r
+\r
+\r
+def main():\r
+    os.system('./data/file_permission.sh')\r
+    cli()\r
+#    os.system('cd data/ref_results && python compute_suite.py')\r
+#    os.system('cd data/ref_results && python storage_suite.py')\r
+#    os.system('cd data/ref_results && python network_suite.py')\r
+#   os.system('cd data/report && python Qtip_Report.py')\r
+\r
+if __name__ == "__main__":\r
+    main()\r