* [LTP] [PATCH] *.py : convert python2 to python3
@ 2018-04-19 10:10 Yong Sun
2018-04-19 16:01 ` Cyril Hrubis
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Yong Sun @ 2018-04-19 10:10 UTC (permalink / raw)
To: ltp
From: yosun <yosun@suse.com>
Convert python code to use python3.
Signed-off-by: Yong Sun <yosun@suse.com>
---
.../kernel/power_management/lib/pm_sched_mc.py | 210 ++++++++++-----------
.../power_management/pm_cpu_consolidation.py | 12 +-
testcases/kernel/power_management/pm_ilb_test.py | 6 +-
.../kernel/power_management/pm_sched_domain.py | 6 +-
testcases/network/nfsv4/acl/cleangroups.py | 2 +-
testcases/network/nfsv4/acl/cleanusers.py | 2 +-
testcases/network/nfsv4/acl/random_gen.py | 30 +--
testcases/network/nfsv4/acl/setacl_stress.py | 2 +-
testcases/network/nfsv4/acl/test_long_acl.py | 16 +-
testcases/network/nfsv4/locks/locktests.py | 56 +++---
testcases/realtime/scripts/parser.py | 2 +-
testcases/realtime/tools/ftqviz.py | 12 +-
testscripts/build/ltp-missing-install-files.py | 4 +-
tools/pounder21/src/time_tests/drift-test.py | 14 +-
14 files changed, 187 insertions(+), 187 deletions(-)
diff --git a/testcases/kernel/power_management/lib/pm_sched_mc.py b/testcases/kernel/power_management/lib/pm_sched_mc.py
index feb4b24d3..92a6dd5c4 100755
--- a/testcases/kernel/power_management/lib/pm_sched_mc.py
+++ b/testcases/kernel/power_management/lib/pm_sched_mc.py
@@ -30,8 +30,8 @@ def clear_dmesg():
'''
try:
os.system('dmesg -c >/dev/null')
- except OSError, e:
- print 'Clearing dmesg failed', e
+ except OSError as e:
+ print('Clearing dmesg failed', e)
sys.exit(1)
def count_num_cpu():
@@ -44,8 +44,8 @@ def count_num_cpu():
if line.startswith('processor'):
cpu_count += 1
cpuinfo.close()
- except IOError, e:
- print "Could not get cpu count", e
+ except IOError as e:
+ print("Could not get cpu count", e)
sys.exit(1)
def count_num_sockets():
@@ -61,8 +61,8 @@ def count_num_sockets():
if socket_id not in socket_list:
socket_list.append(socket_id)
socket_count = socket_count + 1
- except Exception, details:
- print "INFO: Failed to get number of sockets in system", details
+ except Exception as details:
+ print("INFO: Failed to get number of sockets in system", details)
sys.exit(1)
def is_multi_socket():
@@ -74,7 +74,7 @@ def is_multi_socket():
else:
return 0
except Exception:
- print "Failed to check if system is multi socket system"
+ print("Failed to check if system is multi socket system")
sys.exit(1)
def is_hyper_threaded():
@@ -94,7 +94,7 @@ def is_hyper_threaded():
else:
return 0
except Exception:
- print "Failed to check if system is hyper-threaded"
+ print("Failed to check if system is hyper-threaded")
sys.exit(1)
def is_multi_core():
@@ -124,7 +124,7 @@ def is_multi_core():
file_cpuinfo.close()
return multi_core
except Exception:
- print "Failed to check if system is multi core system"
+ print("Failed to check if system is multi core system")
sys.exit(1)
def get_hyper_thread_count():
@@ -142,7 +142,7 @@ def get_hyper_thread_count():
break
return( int( siblings[1] ) / int( cpu_cores[1] ) )
except Exception:
- print "Failed to check if system is hyper-threaded"
+ print("Failed to check if system is hyper-threaded")
sys.exit(1)
def map_cpuid_pkgid():
@@ -158,17 +158,17 @@ def map_cpuid_pkgid():
core_file += '/topology/core_id'
core_id = open(core_file).read().rstrip()
cpu_phy_id = open(phy_pkg_file).read().rstrip()
- if not cpu_phy_id in cpu_map.keys():
+ if not cpu_phy_id in list(cpu_map.keys()):
core_info = {}
else:
core_info = cpu_map[cpu_phy_id]
- if not core_id in core_info.keys():
+ if not core_id in list(core_info.keys()):
core_info[core_id] = [i]
else:
core_info[core_id].append(i)
cpu_map[cpu_phy_id] = core_info
- except Exception, details:
- print "Package, core & cpu map table creation failed", e
+ except Exception as details:
+ print("Package, core & cpu map table creation failed", e)
sys.exit(1)
else:
for i in range(0, cpu_count):
@@ -176,12 +176,12 @@ def map_cpuid_pkgid():
phy_pkg_file = '/sys/devices/system/cpu/cpu%s' %i
phy_pkg_file += '/topology/physical_package_id'
cpu_phy_id = open(phy_pkg_file).read().rstrip()
- if not cpu_phy_id in cpu_map.keys():
+ if not cpu_phy_id in list(cpu_map.keys()):
cpu_map[cpu_phy_id] = [i]
else:
cpu_map[cpu_phy_id].append(i)
- except IOError, e:
- print "Mapping of CPU to pkg id failed", e
+ except IOError as e:
+ print("Mapping of CPU to pkg id failed", e)
sys.exit(1)
@@ -197,8 +197,8 @@ def generate_sibling_list():
if not thread_ids in siblings_list:
siblings_list.append(thread_ids)
- except Exception, details:
- print "Exception in generate_siblings_list", details
+ except Exception as details:
+ print("Exception in generate_siblings_list", details)
sys.exit(1)
def get_siblings(cpu_id):
@@ -215,8 +215,8 @@ def get_siblings(cpu_id):
cpus += j
return cpus
return cpus
- except Exception, details:
- print "Exception in get_siblings", details
+ except Exception as details:
+ print("Exception in get_siblings", details)
sys.exit(1)
def get_proc_data(stats_list):
@@ -229,8 +229,8 @@ def get_proc_data(stats_list):
data = line.split()
stats_list[data[0]] = data
file_procstat.close()
- except OSError, e:
- print "Could not read statistics", e
+ except OSError as e:
+ print("Could not read statistics", e)
sys.exit(1)
def get_proc_loc_count(loc_stats):
@@ -246,8 +246,8 @@ def get_proc_loc_count(loc_stats):
loc_stats.append(data[i+1])
file_procstat.close()
return
- except Exception, details:
- print "Could not read interrupt statistics", details
+ except Exception as details:
+ print("Could not read interrupt statistics", details)
sys.exit(1)
@@ -260,8 +260,8 @@ def set_sched_mc_power(sched_mc_level):
% sched_mc_level)
get_proc_data(stats_start)
- except OSError, e:
- print "Could not set sched_mc_power_savings to", sched_mc_level, e
+ except OSError as e:
+ print("Could not set sched_mc_power_savings to", sched_mc_level, e)
sys.exit(1)
def set_sched_smt_power(sched_smt_level):
@@ -273,8 +273,8 @@ def set_sched_smt_power(sched_smt_level):
% sched_smt_level)
get_proc_data(stats_start)
- except OSError, e:
- print "Could not set sched_smt_power_savings to", sched_smt_level, e
+ except OSError as e:
+ print("Could not set sched_smt_power_savings to", sched_smt_level, e)
sys.exit(1)
def set_timer_migration_interface(value):
@@ -284,8 +284,8 @@ def set_timer_migration_interface(value):
try:
os.system('echo %s > \
/proc/sys/kernel/timer_migration 2>/dev/null' % value)
- except OSError, e:
- print "Could not set timer_migration to ", value, e
+ except OSError as e:
+ print("Could not set timer_migration to ", value, e)
sys.exit(1)
def get_job_count(stress, workload, sched_smt):
@@ -308,8 +308,8 @@ def get_job_count(stress, workload, sched_smt):
threads = 1
duration = 180
return threads
- except Exception, details:
- print "get job count failed ", details
+ except Exception as details:
+ print("get job count failed ", details)
sys.exit(1)
def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
@@ -328,7 +328,7 @@ def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
workload_file = file_name
break
if workload_file == "":
- print "INFO: ebizzy benchmark not found"
+ print("INFO: ebizzy benchmark not found")
os.chdir(olddir)
sys.exit(1)
get_proc_data(stats_start)
@@ -346,21 +346,21 @@ def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
% (threads, duration))
if succ == 0:
- print "INFO: ebizzy workload triggerd"
+ print("INFO: ebizzy workload triggerd")
os.chdir(olddir)
#Commented bcoz it doesnt make sense to capture it when workload triggered
#in background
#get_proc_loc_count(intr_stop)
#get_proc_data(stats_stop)
else:
- print "INFO: ebizzy workload triggerd failed"
+ print("INFO: ebizzy workload triggerd failed")
os.chdir(olddir)
sys.exit(1)
- except Exception, details:
- print "Ebizzy workload trigger failed ", details
+ except Exception as details:
+ print("Ebizzy workload trigger failed ", details)
sys.exit(1)
- except Exception, details:
- print "Ebizzy workload trigger failed ", details
+ except Exception as details:
+ print("Ebizzy workload trigger failed ", details)
sys.exit(1)
def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
@@ -385,7 +385,7 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
if workload_file != "":
benchmark_path = path
else:
- print "INFO: kernbench benchmark not found"
+ print("INFO: kernbench benchmark not found")
os.chdir(olddir)
sys.exit(1)
@@ -398,8 +398,8 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
if linux_source_dir != "":
os.chdir(linux_source_dir)
else:
- print "INFO: Linux kernel source not found in /root. Workload\
- Kernbench cannot be executed"
+ print("INFO: Linux kernel source not found in /root. Workload\
+ Kernbench cannot be executed")
sys.exit(1)
get_proc_data(stats_start)
@@ -428,10 +428,10 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
time.sleep(240)
stop_wkld("kernbench")
- print "INFO: Workload kernbench triggerd"
+ print("INFO: Workload kernbench triggerd")
os.chdir(olddir)
- except Exception, details:
- print "Workload kernbench trigger failed ", details
+ except Exception as details:
+ print("Workload kernbench trigger failed ", details)
sys.exit(1)
def trigger_workld(sched_smt, workload, stress, duration, background, pinned, perf_test):
@@ -443,8 +443,8 @@ def trigger_workld(sched_smt, workload, stress, duration, background, pinned, pe
trigger_ebizzy (sched_smt, stress, duration, background, pinned)
if workload == "kernbench":
trigger_kernbench (sched_smt, stress, background, pinned, perf_test)
- except Exception, details:
- print "INFO: Trigger workload failed", details
+ except Exception as details:
+ print("INFO: Trigger workload failed", details)
sys.exit(1)
def generate_report():
@@ -472,29 +472,29 @@ def generate_report():
stats_percentage[l] = percentage_list
for i in range(0, len(cpu_labels)):
- print >> debugfile, cpu_labels[i], '\t',
- print >> debugfile
+ print(cpu_labels[i], '\t', end=' ', file=debugfile)
+ print(file=debugfile)
for l in sorted(stats_stop.keys()):
- print >> debugfile, l, '\t',
+ print(l, '\t', end=' ', file=debugfile)
for i in range(1, len(stats_stop[l])):
- print >> debugfile, stats_stop[l][i], '\t',
- print >> debugfile
+ print(stats_stop[l][i], '\t', end=' ', file=debugfile)
+ print(file=debugfile)
for i in range(0, len(cpu_labels)):
- print >> reportfile, cpu_labels[i], '\t',
- print >> reportfile
+ print(cpu_labels[i], '\t', end=' ', file=reportfile)
+ print(file=reportfile)
for l in sorted(stats_percentage.keys()):
- print >> reportfile, l, '\t',
+ print(l, '\t', end=' ', file=reportfile)
for i in range(1, len(stats_percentage[l])):
- print >> reportfile, " %3.4f" % stats_percentage[l][i],
- print >> reportfile
+ print(" %3.4f" % stats_percentage[l][i], end=' ', file=reportfile)
+ print(file=reportfile)
#Now get the package ID information
try:
- print >> debugfile, "cpu_map: ", cpu_map
+ print("cpu_map: ", cpu_map, file=debugfile)
keyvalfile = open('/procstat/keyval', 'a')
- print >> keyvalfile, "nr_packages=%d" % len(cpu_map)
- print >> keyvalfile, "system-idle=%3.4f" % (stats_percentage['cpu'][4])
+ print("nr_packages=%d" % len(cpu_map), file=keyvalfile)
+ print("system-idle=%3.4f" % (stats_percentage['cpu'][4]), file=keyvalfile)
for pkg in sorted(cpu_map.keys()):
if is_hyper_threaded():
for core in sorted(cpu_map[pkg].keys()):
@@ -511,20 +511,20 @@ def generate_report():
total_idle += stats_stop["cpu%d" % cpu][4]
for i in range(1, len(stats_stop["cpu%d" % cpu])):
total += stats_stop["cpu%d" % cpu][i]
- print >> reportfile, "Package: ", pkg, "Idle %3.4f%%" \
- % (float(total_idle)*100/total)
- print >> keyvalfile, "package-%s=%3.4f" % \
- (pkg, (float(total_idle)*100/total))
- except Exception, details:
- print "Generating utilization report failed: ", details
+ print("Package: ", pkg, "Idle %3.4f%%" \
+ % (float(total_idle)*100/total), file=reportfile)
+ print("package-%s=%3.4f" % \
+ (pkg, (float(total_idle)*100/total)), file=keyvalfile)
+ except Exception as details:
+ print("Generating utilization report failed: ", details)
sys.exit(1)
#Add record delimiter '\n' before closing these files
- print >> debugfile
+ print(file=debugfile)
debugfile.close()
- print >> reportfile
+ print(file=reportfile)
reportfile.close()
- print >> keyvalfile
+ print(file=keyvalfile)
keyvalfile.close()
def generate_loc_intr_report():
@@ -537,17 +537,17 @@ def generate_loc_intr_report():
get_proc_loc_count(intr_stop)
reportfile = open('/procstat/cpu-loc_interrupts', 'a')
- print >> reportfile, "=============================================="
- print >> reportfile, " Local timer interrupt stats "
- print >> reportfile, "=============================================="
+ print("==============================================", file=reportfile)
+ print(" Local timer interrupt stats ", file=reportfile)
+ print("==============================================", file=reportfile)
for i in range(0, cpu_count):
intr_stop[i] = int(intr_stop[i]) - int(intr_start[i])
- print >> reportfile, "CPU%s: %s" %(i, intr_stop[i])
- print >> reportfile
+ print("CPU%s: %s" %(i, intr_stop[i]), file=reportfile)
+ print(file=reportfile)
reportfile.close()
- except Exception, details:
- print "Generating interrupt report failed: ", details
+ except Exception as details:
+ print("Generating interrupt report failed: ", details)
sys.exit(1)
def record_loc_intr_count():
@@ -560,8 +560,8 @@ def record_loc_intr_count():
intr_stat_timer_0.append(intr_stop[i])
intr_start = []
intr_stop = []
- except Exception, details:
- print "INFO: Record interrupt statistics when timer_migration=0",details
+ except Exception as details:
+ print("INFO: Record interrupt statistics when timer_migration=0",details)
def expand_range(range_val):
'''
@@ -578,8 +578,8 @@ def expand_range(range_val):
for j in range(int(hyphen_values[0]), int(hyphen_values[1])+1):
ids_list.append(j)
return(ids_list)
- except Exception, details:
- print "INFO: expand_pkg_grps failed ", details
+ except Exception as details:
+ print("INFO: expand_pkg_grps failed ", details)
def is_quad_core():
'''
@@ -596,8 +596,8 @@ def is_quad_core():
return(1)
else:
return(0)
- except IOError, e:
- print "Failed to get cpu core information", e
+ except IOError as e:
+ print("Failed to get cpu core information", e)
sys.exit(1)
def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
@@ -640,8 +640,8 @@ def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
return(1)
- except Exception, details:
- print "Exception in validate_cpugrp_map: ", details
+ except Exception as details:
+ print("Exception in validate_cpugrp_map: ", details)
sys.exit(1)
@@ -680,8 +680,8 @@ def verify_sched_domain_dmesg(sched_mc_level, sched_smt_level):
return(0)
else:
return(1)
- except Exception, details:
- print "Reading dmesg failed", details
+ except Exception as details:
+ print("Reading dmesg failed", details)
sys.exit(1)
def get_cpu_utilization(cpu):
@@ -692,8 +692,8 @@ def get_cpu_utilization(cpu):
if cpu == stats_percentage[l][0]:
return stats_percentage[l][1]
return -1
- except Exception, details:
- print "Exception in get_cpu_utilization", details
+ except Exception as details:
+ print("Exception in get_cpu_utilization", details)
sys.exit(1)
def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level):
@@ -737,7 +737,7 @@ def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level)
if stats_percentage[l][1] > 70:
cpus_utilized.append(int(cpu_id[1]))
cpus_utilized.sort()
- print "INFO: CPU's utilized ", cpus_utilized
+ print("INFO: CPU's utilized ", cpus_utilized)
# If length of CPU's utilized is not = number of jobs exit with 1
if len(cpus_utilized) < threads:
@@ -746,11 +746,11 @@ def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level)
status = validate_cpugrp_map(cpus_utilized, sched_mc_level, \
sched_smt_level)
if status == 1:
- print "INFO: CPUs utilized is not in same package or core"
+ print("INFO: CPUs utilized is not in same package or core")
return(status)
- except Exception, details:
- print "Exception in validate_cpu_consolidation: ", details
+ except Exception as details:
+ print("Exception in validate_cpu_consolidation: ", details)
sys.exit(1)
def get_cpuid_max_intr_count():
@@ -780,13 +780,13 @@ def get_cpuid_max_intr_count():
diff = second_highest - intr_stop[i]
''' Threshold of difference has to be manipulated '''
if diff < 10000:
- print "INFO: Diff in interrupt count is below threshold"
+ print("INFO: Diff in interrupt count is below threshold")
cpus_utilized = []
return cpus_utilized
- print "INFO: Interrupt count in other CPU's low as expected"
+ print("INFO: Interrupt count in other CPU's low as expected")
return cpus_utilized
- except Exception, details:
- print "Exception in get_cpuid_max_intr_count: ", details
+ except Exception as details:
+ print("Exception in get_cpuid_max_intr_count: ", details)
sys.exit(1)
def validate_ilb (sched_mc_level, sched_smt_level):
@@ -799,8 +799,8 @@ def validate_ilb (sched_mc_level, sched_smt_level):
status = validate_cpugrp_map(cpus_utilized, sched_mc_level, sched_smt_level)
return status
- except Exception, details:
- print "Exception in validate_ilb: ", details
+ except Exception as details:
+ print("Exception in validate_ilb: ", details)
sys.exit(1)
def reset_schedmc():
@@ -809,8 +809,8 @@ def reset_schedmc():
try:
os.system('echo 0 > \
/sys/devices/system/cpu/sched_mc_power_savings 2>/dev/null')
- except OSError, e:
- print "Could not set sched_mc_power_savings to 0", e
+ except OSError as e:
+ print("Could not set sched_mc_power_savings to 0", e)
sys.exit(1)
def reset_schedsmt():
@@ -819,8 +819,8 @@ def reset_schedsmt():
try:
os.system('echo 0 > \
/sys/devices/system/cpu/sched_smt_power_savings 2>/dev/null')
- except OSError, e:
- print "Could not set sched_smt_power_savings to 0", e
+ except OSError as e:
+ print("Could not set sched_smt_power_savings to 0", e)
sys.exit(1)
def stop_wkld(work_ld):
@@ -830,6 +830,6 @@ def stop_wkld(work_ld):
os.system('pkill %s 2>/dev/null' %work_ld)
if work_ld == "kernbench":
os.system('pkill make 2>/dev/null')
- except OSError, e:
- print "Exception in stop_wkld", e
+ except OSError as e:
+ print("Exception in stop_wkld", e)
sys.exit(1)
diff --git a/testcases/kernel/power_management/pm_cpu_consolidation.py b/testcases/kernel/power_management/pm_cpu_consolidation.py
index 734db2759..0a1772806 100755
--- a/testcases/kernel/power_management/pm_cpu_consolidation.py
+++ b/testcases/kernel/power_management/pm_cpu_consolidation.py
@@ -79,7 +79,7 @@ def main(argv=None):
generate_report()
status = validate_cpu_consolidation("partial", work_ld, options.mc_value, options.smt_value)
if status == 0:
- print "INFO: Consolidation worked sched_smt &(/) sched_mc is set"
+ print("INFO: Consolidation worked sched_smt &(/) sched_mc is set")
#Disable sched_smt & sched_mc interface values
if options.vary_mc_smt and options.mc_value > 0:
set_sched_mc_power(0)
@@ -107,8 +107,8 @@ def main(argv=None):
else:
return(1)
else:
- print "INFO: CPU consolidation failed when sched_mc &(/) \
-sched_smt was enabled. This is pre-requisite to proceed"
+ print("INFO: CPU consolidation failed when sched_mc &(/) \
+sched_smt was enabled. This is pre-requisite to proceed")
return(status)
else:
#The else part of the code validates behaviour of sched_mc
@@ -118,7 +118,7 @@ sched_smt was enabled. This is pre-requisite to proceed"
if is_hyper_threaded():
set_sched_smt_power(options.smt_value)
map_cpuid_pkgid()
- print "INFO: Created table mapping cpu to package"
+ print("INFO: Created table mapping cpu to package")
background="no"
duration=60
pinned ="no"
@@ -135,8 +135,8 @@ sched_smt was enabled. This is pre-requisite to proceed"
if is_hyper_threaded():
reset_schedsmt()
return(status)
- except Exception, details:
- print "INFO: CPU consolidation failed", details
+ except Exception as details:
+ print("INFO: CPU consolidation failed", details)
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_ilb_test.py b/testcases/kernel/power_management/pm_ilb_test.py
index 0b447d804..749c0273e 100755
--- a/testcases/kernel/power_management/pm_ilb_test.py
+++ b/testcases/kernel/power_management/pm_ilb_test.py
@@ -36,7 +36,7 @@ def main(argv=None):
if is_hyper_threaded():
set_sched_smt_power(options.smt_level)
map_cpuid_pkgid()
- print "INFO: Created table mapping cpu to package"
+ print("INFO: Created table mapping cpu to package")
background="no"
duration=120
pinned="yes"
@@ -49,8 +49,8 @@ def main(argv=None):
reset_schedsmt()
return(status)
- except Exception, details:
- print "INFO: Idle Load Balancer test failed", details
+ except Exception as details:
+ print("INFO: Idle Load Balancer test failed", details)
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_sched_domain.py b/testcases/kernel/power_management/pm_sched_domain.py
index a54b0e9be..f6fd5ae99 100755
--- a/testcases/kernel/power_management/pm_sched_domain.py
+++ b/testcases/kernel/power_management/pm_sched_domain.py
@@ -43,10 +43,10 @@ def main(argv=None):
reset_schedsmt()
return(status)
else:
- print "INFO: Invalid arguments given"
+ print("INFO: Invalid arguments given")
return 1
- except Exception, details:
- print "INFO: sched domain test failed: ", details
+ except Exception as details:
+ print("INFO: sched domain test failed: ", details)
return(1)
# Run test based on the command line arguments
diff --git a/testcases/network/nfsv4/acl/cleangroups.py b/testcases/network/nfsv4/acl/cleangroups.py
index 341746e83..fbf5dcbf7 100755
--- a/testcases/network/nfsv4/acl/cleangroups.py
+++ b/testcases/network/nfsv4/acl/cleangroups.py
@@ -1,6 +1,6 @@
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/cleanusers.py b/testcases/network/nfsv4/acl/cleanusers.py
index 7ac435087..ef9088449 100755
--- a/testcases/network/nfsv4/acl/cleanusers.py
+++ b/testcases/network/nfsv4/acl/cleanusers.py
@@ -1,6 +1,6 @@
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/random_gen.py b/testcases/network/nfsv4/acl/random_gen.py
index d39dbb3db..dcf63860a 100755
--- a/testcases/network/nfsv4/acl/random_gen.py
+++ b/testcases/network/nfsv4/acl/random_gen.py
@@ -1,4 +1,4 @@
-import commands
+import subprocess
import random
import re
@@ -30,20 +30,20 @@ class RandomGen(object):
def createUser(self,username):
group = self.gList[random.randint(0,len(self.gList)-1)][0]
opts = "-g" + group + " -p" + "1pilot" + " -m " + username
- u = commands.getoutput('/usr/sbin/useradd '+ opts)
+ u = subprocess.getoutput('/usr/sbin/useradd '+ opts)
if u != "":
- print "create user " + username + "failed" + u
+ print("create user " + username + "failed" + u)
def createFile(self,path,n):
for i in range(n):
fName = 'file' + str(i)
- u = commands.getoutput('touch ' + path + '/'+ fName)
+ u = subprocess.getoutput('touch ' + path + '/'+ fName)
self.fList.append(fName)
def createGroup(self, grpname, gid):
- u = commands.getoutput('/usr/sbin/groupadd -g' + gid + " " + grpname)
+ u = subprocess.getoutput('/usr/sbin/groupadd -g' + gid + " " + grpname)
if u != "":
- print u
+ print(u)
def createNGroup(self, n):
for i in range(n):
@@ -61,13 +61,13 @@ class RandomGen(object):
""" clean all users created to do the tests """
def cleanUsers(self):
for name in self.uList:
- u = commands.getoutput('/usr/sbin/userdel -r '+ name)
+ u = subprocess.getoutput('/usr/sbin/userdel -r '+ name)
self.uList = []
""" clean all users created to do the tests """
def cleanGroups(self):
for name in self.gList:
- u = commands.getoutput('/usr/sbin/groupdel '+ name[0])
+ u = subprocess.getoutput('/usr/sbin/groupdel '+ name[0])
self.gList = []
""" Retrieve the list of user from /etc/passwd file """
@@ -86,7 +86,7 @@ class RandomGen(object):
f.close()
def getFileList(self,path):
- u = commands.getoutput('ls ' + path)
+ u = subprocess.getoutput('ls ' + path)
tmp = u.split('\n')
for i in range (len(tmp)-1):
NameOK = re.match("file",tmp[i])
@@ -142,10 +142,10 @@ class RandomGen(object):
f.close()
def printUserList(self):
- print self.uList
+ print(self.uList)
def printGroupList(self):
- print self.gList
+ print(self.gList)
""" Create a random name of random length """
def createOneNameRandomLength(self,maxlength):
@@ -211,19 +211,19 @@ class RandomGen(object):
file = self.fList[random.randint(0,len(self.fList)-1)]
if a == 1: # creation/modification
user = self.uList[random.randint(0,len(self.uList)-1)]
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + file)
if a == 2: # with group
group = self.gList[random.randint(0,len(self.gList)-1)][0]
- u = commands.getoutput('setfacl -m g:' + group + ':' + mode + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -m g:' + group + ':' + mode + " " + path + "/" + file)
if a == 3: # deletation
user = self.uList[random.randint(0,len(self.uList)-1)]
- u = commands.getoutput('setfacl -x u:' + user + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -x u:' + user + " " + path + "/" + file)
if a == 4: # with group
group = self.gList[random.randint(0,len(self.gList)-1)][0]
- u = commands.getoutput('setfacl -x g:' + group + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -x g:' + group + " " + path + "/" + file)
# request on a unexisting group
'''if a == 5:
diff --git a/testcases/network/nfsv4/acl/setacl_stress.py b/testcases/network/nfsv4/acl/setacl_stress.py
index 3713ff6a9..2001e9f78 100755
--- a/testcases/network/nfsv4/acl/setacl_stress.py
+++ b/testcases/network/nfsv4/acl/setacl_stress.py
@@ -6,7 +6,7 @@
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/test_long_acl.py b/testcases/network/nfsv4/acl/test_long_acl.py
index a7c8cb1a1..8b3c33b84 100755
--- a/testcases/network/nfsv4/acl/test_long_acl.py
+++ b/testcases/network/nfsv4/acl/test_long_acl.py
@@ -4,7 +4,7 @@
'''
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import threading
import time
@@ -19,20 +19,20 @@ def test_longacl(l,path):
# mesures sur le getfacl
test = RandomGen()
- u = commands.getoutput('rm ' + path + "/*") # clean directory
- print "test acl getfacl\n"
+ u = subprocess.getoutput('rm ' + path + "/*") # clean directory
+ print("test acl getfacl\n")
for i in range(l):
test.getUserList()
testfile = 'testfile' + str(i)
- u = commands.getoutput('touch ' + path + "/" + testfile)
- print "setfacl with " + str(i) + " entries\n " + u
+ u = subprocess.getoutput('touch ' + path + "/" + testfile)
+ print("setfacl with " + str(i) + " entries\n " + u)
for j in range(i):
user = test.uList.pop()
mode = test.createRandomMode()
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
if u != "":
- print "setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile
- print u
+ print("setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile)
+ print(u)
def main():
parser = OptionParser()
parser.add_option("-l", "--length", dest="length",type="int",help="max lentgh of ACL")
diff --git a/testcases/network/nfsv4/locks/locktests.py b/testcases/network/nfsv4/locks/locktests.py
index dd518ab6e..6aa9392b2 100755
--- a/testcases/network/nfsv4/locks/locktests.py
+++ b/testcases/network/nfsv4/locks/locktests.py
@@ -38,8 +38,8 @@ class Machine:
self.do()
def printc(self):
- print "->"+self.command
- print "\n"
+ print("->"+self.command)
+ print("\n")
class Client(Machine):
@@ -95,25 +95,25 @@ class Serveur(Machine):
self.unexport(unexportDir)
self.rmdir(unexportDir)
def usage():
- print "\n"
- print "usage:"
- print "locktests.py <-n process -f testfile ><--setup -s fs_server> -c host1, host2, host3 ... "
- print "--setup : setup the configuration, deploy test on other test machines; This option also requires -c and -s"
- print "-c <machine> : host list to deploy/run/clean the test"
- print "-s <machine> : NFS server to use to setup the test"
- print "-n <num> : number of processes each test machine will lauch to perform the test"
- print "-f <file> : test file. This must be the same on each machine"
- print " "
- print "Example :"
- print "========="
- print "*Setup machines for testing"
- print "./locktests.py --setup -c testmachine1 testmachine2 testmachine3 -s my_nfs_server:/"
- print "\n"
- print "*Run test on testmachine1,testmachine2 with 50 process on each machine using /mnt/nfsv4/testfile"
- print "./locktests.py -n 50 -f /mnt/nfsv4/testfile -c testmachine1 testmachine2"
- print "\n"
- print "_________________________________"
- print "Vincent ROQUETA - Bull SA - 2005\n"
+ print("\n")
+ print("usage:")
+ print("locktests.py <-n process -f testfile ><--setup -s fs_server> -c host1, host2, host3 ... ")
+ print("--setup : setup the configuration, deploy test on other test machines; This option also requires -c and -s")
+ print("-c <machine> : host list to deploy/run/clean the test")
+ print("-s <machine> : NFS server to use to setup the test")
+ print("-n <num> : number of processes each test machine will lauch to perform the test")
+ print("-f <file> : test file. This must be the same on each machine")
+ print(" ")
+ print("Example :")
+ print("=========")
+ print("*Setup machines for testing")
+ print("./locktests.py --setup -c testmachine1 testmachine2 testmachine3 -s my_nfs_server:/")
+ print("\n")
+ print("*Run test on testmachine1,testmachine2 with 50 process on each machine using /mnt/nfsv4/testfile")
+ print("./locktests.py -n 50 -f /mnt/nfsv4/testfile -c testmachine1 testmachine2")
+ print("\n")
+ print("_________________________________")
+ print("Vincent ROQUETA - Bull SA - 2005\n")
return 0
@@ -124,14 +124,14 @@ def setup():
fichier=SRC_PATH+"/"+SRC
commande=""
for i in clients:
- print "Setting up machine "+i
+ print("Setting up machine "+i)
c=Client(i)
c.mkdir(path)
c.cp(fichier, path)
c.install(path)
c.isomount(NFS4_PATH)
#Setup localhost
- print "Setting up localhost"
+ print("Setting up localhost")
commande="make; mkdir -p "+NFS4_PATH+" ; mount -t nfs4 "+NFS4_SERVER+" "+NFS4_PATH+" &"
os.system(commande)
@@ -159,7 +159,7 @@ def clean():
args=sys.argv[1:]
-rge=range(len(args))
+rge=list(range(len(args)))
a=""
r=True
s=False
@@ -213,17 +213,17 @@ if s:
if (not c) or (not nfsServer):
usage()
sys.exit(1)
- print "Setup"
- print NFS4_SERVER
+ print("Setup")
+ print(NFS4_SERVER)
setup()
- print "Setup complete"
+ print("Setup complete")
if r:
if (not c) or (not f) or (not n):
usage()
sys.exit(1)
- print "Running test"
+ print("Running test")
run()
diff --git a/testcases/realtime/scripts/parser.py b/testcases/realtime/scripts/parser.py
index 6b2dc7370..d43ce5318 100644
--- a/testcases/realtime/scripts/parser.py
+++ b/testcases/realtime/scripts/parser.py
@@ -34,7 +34,7 @@ class Log:
log_file=filename
try:
self.__log_file = open(log_file, "r")
- except IOError, errmsg:
+ except IOError as errmsg:
sys.exit(errmsg)
def read(self):
diff --git a/testcases/realtime/tools/ftqviz.py b/testcases/realtime/tools/ftqviz.py
index 19ae093a0..22f102e53 100644
--- a/testcases/realtime/tools/ftqviz.py
+++ b/testcases/realtime/tools/ftqviz.py
@@ -37,7 +37,7 @@ NS_PER_US = 1000
def smooth(x, wlen):
if x.size < wlen:
- raise ValueError, "Input vector needs to be bigger than window size."
+ raise ValueError("Input vector needs to be bigger than window size.")
# reflect the signal to avoid transients... ?
s = r_[2*x[0]-x[wlen:1:-1], x, 2*x[-1]-x[-1:-wlen:-1]]
@@ -62,8 +62,8 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# same factor
ns_per_sample = NS_PER_S / sample_hz
- print "Interpolated Sample Rate: ", sample_hz, " HZ"
- print "Hamming Window Length: ", wlen
+ print("Interpolated Sample Rate: ", sample_hz, " HZ")
+ print("Hamming Window Length: ", wlen)
t = fromfile(timefile, dtype=int64, sep='\n')
x = fromfile(countfile, dtype=int64, sep='\n')
@@ -83,7 +83,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# smooth the signal (low pass filter)
try:
y = smooth(xi, wlen)
- except ValueError, e:
+ except ValueError as e:
exit(e)
# generate the fft
@@ -121,7 +121,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
def usage():
- print "usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]"
+ print("usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]")
if __name__=='__main__':
@@ -143,7 +143,7 @@ if __name__=='__main__':
usage()
exit()
if o == "-s":
- sample_hz = long(a)
+ sample_hz = int@
if o == "-t":
times_file = a
if o == "-w":
diff --git a/testscripts/build/ltp-missing-install-files.py b/testscripts/build/ltp-missing-install-files.py
index 1ab40a09f..a1af30e48 100755
--- a/testscripts/build/ltp-missing-install-files.py
+++ b/testscripts/build/ltp-missing-install-files.py
@@ -111,6 +111,6 @@ for logfile in logfiles:
fd.close()
if len(missing_ents):
- print "\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents])
+ print("\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents]))
elif opts.verbose:
- print "%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile)
+ print("%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile))
diff --git a/tools/pounder21/src/time_tests/drift-test.py b/tools/pounder21/src/time_tests/drift-test.py
index aba1909e3..c765d6f4b 100755
--- a/tools/pounder21/src/time_tests/drift-test.py
+++ b/tools/pounder21/src/time_tests/drift-test.py
@@ -24,7 +24,7 @@
# Usage: drift-test.py [-s] [ntp_server [sleep_time]]
-import commands
+import subprocess
import sys
import string
import time
@@ -52,9 +52,9 @@ if sleep_time == 0:
#set time
if (set_time == 1):
- cmd = commands.getoutput('/usr/sbin/ntpdate -ub ' + server)
+ cmd = subprocess.getoutput('/usr/sbin/ntpdate -ub ' + server)
-cmd = commands.getoutput('/usr/sbin/ntpdate -uq ' + server)
+cmd = subprocess.getoutput('/usr/sbin/ntpdate -uq ' + server)
line = string.split(cmd)
#parse original offset
@@ -65,7 +65,7 @@ datestr = time.strftime("%d %b %Y %H:%M:%S", start_time)
time.sleep(1)
while 1:
- cmd = commands.getoutput('/usr/sbin/ntpdate -uq ' + server)
+ cmd = subprocess.getoutput('/usr/sbin/ntpdate -uq ' + server)
line = string.split(cmd)
#parse offset
@@ -81,9 +81,9 @@ while 1:
drift = delta_offset / delta_time * 1000000
#print output
- print time.strftime("%d %b %H:%M:%S",now_time),
- print " offset:", now_offset ,
- print " drift:", drift ,"ppm"
+ print(time.strftime("%d %b %H:%M:%S",now_time), end=' ')
+ print(" offset:", now_offset, end=' ')
+ print(" drift:", drift ,"ppm")
sys.stdout.flush()
#sleep
--
2.13.6
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH] *.py : convert python2 to python3
2018-04-19 10:10 [LTP] [PATCH] *.py : convert python2 to python3 Yong Sun
@ 2018-04-19 16:01 ` Cyril Hrubis
2018-04-20 10:09 ` Petr Vorel
2018-04-20 9:59 ` Petr Vorel
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Cyril Hrubis @ 2018-04-19 16:01 UTC (permalink / raw)
To: ltp
Hi!
Looks good but shouldn't we update hashbangs to python3 since these
changes effectively make the code python3 only?
Also there is execltp.in that is written in python, have you looked at
that source? Is that one python3 compatible?
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] *.py : convert python2 to python3
2018-04-19 10:10 [LTP] [PATCH] *.py : convert python2 to python3 Yong Sun
2018-04-19 16:01 ` Cyril Hrubis
@ 2018-04-20 9:59 ` Petr Vorel
2018-04-20 10:00 ` Yong Sun
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Petr Vorel @ 2018-04-20 9:59 UTC (permalink / raw)
To: ltp
Hi Yong,
> From: yosun <yosun@suse.com>
> Convert python code to use python3.
> Signed-off-by: Yong Sun <yosun@suse.com>
> ---
> .../kernel/power_management/lib/pm_sched_mc.py | 210 ++++++++++-----------
> .../power_management/pm_cpu_consolidation.py | 12 +-
> testcases/kernel/power_management/pm_ilb_test.py | 6 +-
> .../kernel/power_management/pm_sched_domain.py | 6 +-
> testcases/network/nfsv4/acl/cleangroups.py | 2 +-
> testcases/network/nfsv4/acl/cleanusers.py | 2 +-
> testcases/network/nfsv4/acl/random_gen.py | 30 +--
> testcases/network/nfsv4/acl/setacl_stress.py | 2 +-
> testcases/network/nfsv4/acl/test_long_acl.py | 16 +-
> testcases/network/nfsv4/locks/locktests.py | 56 +++---
> testcases/realtime/scripts/parser.py | 2 +-
> testcases/realtime/tools/ftqviz.py | 12 +-
> testscripts/build/ltp-missing-install-files.py | 4 +-
> tools/pounder21/src/time_tests/drift-test.py | 14 +-
> 14 files changed, 187 insertions(+), 187 deletions(-)
Some files are needed.
$ git ls-files |grep '\.py$' | grep -v __init__.py | wc -l
19
The reason is that some files doesn't have shebang. Could you please add it into them and
convert all python scripts?
> diff --git a/testcases/kernel/power_management/lib/pm_sched_mc.py b/testcases/kernel/power_management/lib/pm_sched_mc.py
> index feb4b24d3..92a6dd5c4 100755
> --- a/testcases/kernel/power_management/lib/pm_sched_mc.py
> +++ b/testcases/kernel/power_management/lib/pm_sched_mc.py
> @@ -30,8 +30,8 @@ def clear_dmesg():
> '''
> try:
> os.system('dmesg -c >/dev/null')
> - except OSError, e:
> - print 'Clearing dmesg failed', e
> + except OSError as e:
> + print('Clearing dmesg failed', e)
> sys.exit(1)
There are some issues with mixing tabs and spaces. See:
$ python3 -m py_compile testcases/kernel/power_management/lib/pm_sched_mc.py
Sorry: TabError: inconsistent use of tabs and spaces in indentation (pm_sched_mc.py, line 265)
These tabs on sys.exit(1) were here before, but py_compile from python2 is more relax
about it than the one from python3. Could you please fix it as well and check it for all
scripts?
Kind regards,
Petr
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] *.py : convert python2 to python3
2018-04-19 10:10 [LTP] [PATCH] *.py : convert python2 to python3 Yong Sun
2018-04-19 16:01 ` Cyril Hrubis
2018-04-20 9:59 ` Petr Vorel
@ 2018-04-20 10:00 ` Yong Sun
2018-04-23 3:32 ` [LTP] [PATCH v2] " Yong Sun
2018-04-23 8:12 ` [LTP] [PATCH v3] " Yong Sun
4 siblings, 0 replies; 12+ messages in thread
From: Yong Sun @ 2018-04-20 10:00 UTC (permalink / raw)
To: ltp
From: yosun <yosun@suse.com>
Convert python code to use python3.
Signed-off-by: Yong Sun <yosun@suse.com>
---
execltp.in | 10 +-
.../kernel/power_management/lib/pm_sched_mc.py | 210 ++++++++++-----------
.../power_management/pm_cpu_consolidation.py | 12 +-
testcases/kernel/power_management/pm_ilb_test.py | 6 +-
.../kernel/power_management/pm_sched_domain.py | 6 +-
testcases/network/nfsv4/acl/cleangroups.py | 2 +-
testcases/network/nfsv4/acl/cleanusers.py | 2 +-
testcases/network/nfsv4/acl/random_gen.py | 30 +--
testcases/network/nfsv4/acl/setacl_stress.py | 2 +-
testcases/network/nfsv4/acl/test_long_acl.py | 16 +-
testcases/network/nfsv4/locks/locktests.py | 56 +++---
testcases/realtime/scripts/parser.py | 2 +-
testcases/realtime/tools/ftqviz.py | 12 +-
testscripts/build/ltp-missing-install-files.py | 4 +-
tools/pounder21/src/time_tests/drift-test.py | 14 +-
15 files changed, 192 insertions(+), 192 deletions(-)
diff --git a/execltp.in b/execltp.in
index 10b1f53f3..1a56d7253 100755
--- a/execltp.in
+++ b/execltp.in
@@ -146,7 +146,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
while True:
- line = line_iterator.next()
+ line = next(line_iterator)
if line.startswith(end_output):
@@ -161,7 +161,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
while True:
- line = line_iterator.next()
+ line = next(line_iterator)
match = tag_re.match(line)
@@ -177,7 +177,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
except StopIteration:
pass
- for k in context.keys():
+ for k in list(context.keys()):
if k not in search_tags:
raise ResultsParseException('Leftover token in search '
'keys: %s' % k)
@@ -219,7 +219,7 @@ def print_context(output_dest, header, testsuite_context):
output_dest.write('\n'.join(['', '=' * 40, header, '-' * 40, '']))
- for test, context in testsuite_context.items():
+ for test, context in list(testsuite_context.items()):
output_dest.write('<output test="%s">\n%s\n</output>\n' %
(test, context.strip()))
@@ -302,7 +302,7 @@ def main():
if not opts.summary_mode and not opts.verbose:
parser.error('You cannot suppress summary output and disable '
'verbosity.')
- elif opts.summary_mode not in range(3):
+ elif opts.summary_mode not in list(range(3)):
parser.error('--summary-mode must be a value between 0 and 2.')
if len(args) == 0:
diff --git a/testcases/kernel/power_management/lib/pm_sched_mc.py b/testcases/kernel/power_management/lib/pm_sched_mc.py
index feb4b24d3..92a6dd5c4 100755
--- a/testcases/kernel/power_management/lib/pm_sched_mc.py
+++ b/testcases/kernel/power_management/lib/pm_sched_mc.py
@@ -30,8 +30,8 @@ def clear_dmesg():
'''
try:
os.system('dmesg -c >/dev/null')
- except OSError, e:
- print 'Clearing dmesg failed', e
+ except OSError as e:
+ print('Clearing dmesg failed', e)
sys.exit(1)
def count_num_cpu():
@@ -44,8 +44,8 @@ def count_num_cpu():
if line.startswith('processor'):
cpu_count += 1
cpuinfo.close()
- except IOError, e:
- print "Could not get cpu count", e
+ except IOError as e:
+ print("Could not get cpu count", e)
sys.exit(1)
def count_num_sockets():
@@ -61,8 +61,8 @@ def count_num_sockets():
if socket_id not in socket_list:
socket_list.append(socket_id)
socket_count = socket_count + 1
- except Exception, details:
- print "INFO: Failed to get number of sockets in system", details
+ except Exception as details:
+ print("INFO: Failed to get number of sockets in system", details)
sys.exit(1)
def is_multi_socket():
@@ -74,7 +74,7 @@ def is_multi_socket():
else:
return 0
except Exception:
- print "Failed to check if system is multi socket system"
+ print("Failed to check if system is multi socket system")
sys.exit(1)
def is_hyper_threaded():
@@ -94,7 +94,7 @@ def is_hyper_threaded():
else:
return 0
except Exception:
- print "Failed to check if system is hyper-threaded"
+ print("Failed to check if system is hyper-threaded")
sys.exit(1)
def is_multi_core():
@@ -124,7 +124,7 @@ def is_multi_core():
file_cpuinfo.close()
return multi_core
except Exception:
- print "Failed to check if system is multi core system"
+ print("Failed to check if system is multi core system")
sys.exit(1)
def get_hyper_thread_count():
@@ -142,7 +142,7 @@ def get_hyper_thread_count():
break
return( int( siblings[1] ) / int( cpu_cores[1] ) )
except Exception:
- print "Failed to check if system is hyper-threaded"
+ print("Failed to check if system is hyper-threaded")
sys.exit(1)
def map_cpuid_pkgid():
@@ -158,17 +158,17 @@ def map_cpuid_pkgid():
core_file += '/topology/core_id'
core_id = open(core_file).read().rstrip()
cpu_phy_id = open(phy_pkg_file).read().rstrip()
- if not cpu_phy_id in cpu_map.keys():
+ if not cpu_phy_id in list(cpu_map.keys()):
core_info = {}
else:
core_info = cpu_map[cpu_phy_id]
- if not core_id in core_info.keys():
+ if not core_id in list(core_info.keys()):
core_info[core_id] = [i]
else:
core_info[core_id].append(i)
cpu_map[cpu_phy_id] = core_info
- except Exception, details:
- print "Package, core & cpu map table creation failed", e
+ except Exception as details:
+ print("Package, core & cpu map table creation failed", e)
sys.exit(1)
else:
for i in range(0, cpu_count):
@@ -176,12 +176,12 @@ def map_cpuid_pkgid():
phy_pkg_file = '/sys/devices/system/cpu/cpu%s' %i
phy_pkg_file += '/topology/physical_package_id'
cpu_phy_id = open(phy_pkg_file).read().rstrip()
- if not cpu_phy_id in cpu_map.keys():
+ if not cpu_phy_id in list(cpu_map.keys()):
cpu_map[cpu_phy_id] = [i]
else:
cpu_map[cpu_phy_id].append(i)
- except IOError, e:
- print "Mapping of CPU to pkg id failed", e
+ except IOError as e:
+ print("Mapping of CPU to pkg id failed", e)
sys.exit(1)
@@ -197,8 +197,8 @@ def generate_sibling_list():
if not thread_ids in siblings_list:
siblings_list.append(thread_ids)
- except Exception, details:
- print "Exception in generate_siblings_list", details
+ except Exception as details:
+ print("Exception in generate_siblings_list", details)
sys.exit(1)
def get_siblings(cpu_id):
@@ -215,8 +215,8 @@ def get_siblings(cpu_id):
cpus += j
return cpus
return cpus
- except Exception, details:
- print "Exception in get_siblings", details
+ except Exception as details:
+ print("Exception in get_siblings", details)
sys.exit(1)
def get_proc_data(stats_list):
@@ -229,8 +229,8 @@ def get_proc_data(stats_list):
data = line.split()
stats_list[data[0]] = data
file_procstat.close()
- except OSError, e:
- print "Could not read statistics", e
+ except OSError as e:
+ print("Could not read statistics", e)
sys.exit(1)
def get_proc_loc_count(loc_stats):
@@ -246,8 +246,8 @@ def get_proc_loc_count(loc_stats):
loc_stats.append(data[i+1])
file_procstat.close()
return
- except Exception, details:
- print "Could not read interrupt statistics", details
+ except Exception as details:
+ print("Could not read interrupt statistics", details)
sys.exit(1)
@@ -260,8 +260,8 @@ def set_sched_mc_power(sched_mc_level):
% sched_mc_level)
get_proc_data(stats_start)
- except OSError, e:
- print "Could not set sched_mc_power_savings to", sched_mc_level, e
+ except OSError as e:
+ print("Could not set sched_mc_power_savings to", sched_mc_level, e)
sys.exit(1)
def set_sched_smt_power(sched_smt_level):
@@ -273,8 +273,8 @@ def set_sched_smt_power(sched_smt_level):
% sched_smt_level)
get_proc_data(stats_start)
- except OSError, e:
- print "Could not set sched_smt_power_savings to", sched_smt_level, e
+ except OSError as e:
+ print("Could not set sched_smt_power_savings to", sched_smt_level, e)
sys.exit(1)
def set_timer_migration_interface(value):
@@ -284,8 +284,8 @@ def set_timer_migration_interface(value):
try:
os.system('echo %s > \
/proc/sys/kernel/timer_migration 2>/dev/null' % value)
- except OSError, e:
- print "Could not set timer_migration to ", value, e
+ except OSError as e:
+ print("Could not set timer_migration to ", value, e)
sys.exit(1)
def get_job_count(stress, workload, sched_smt):
@@ -308,8 +308,8 @@ def get_job_count(stress, workload, sched_smt):
threads = 1
duration = 180
return threads
- except Exception, details:
- print "get job count failed ", details
+ except Exception as details:
+ print("get job count failed ", details)
sys.exit(1)
def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
@@ -328,7 +328,7 @@ def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
workload_file = file_name
break
if workload_file == "":
- print "INFO: ebizzy benchmark not found"
+ print("INFO: ebizzy benchmark not found")
os.chdir(olddir)
sys.exit(1)
get_proc_data(stats_start)
@@ -346,21 +346,21 @@ def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
% (threads, duration))
if succ == 0:
- print "INFO: ebizzy workload triggerd"
+ print("INFO: ebizzy workload triggerd")
os.chdir(olddir)
#Commented bcoz it doesnt make sense to capture it when workload triggered
#in background
#get_proc_loc_count(intr_stop)
#get_proc_data(stats_stop)
else:
- print "INFO: ebizzy workload triggerd failed"
+ print("INFO: ebizzy workload triggerd failed")
os.chdir(olddir)
sys.exit(1)
- except Exception, details:
- print "Ebizzy workload trigger failed ", details
+ except Exception as details:
+ print("Ebizzy workload trigger failed ", details)
sys.exit(1)
- except Exception, details:
- print "Ebizzy workload trigger failed ", details
+ except Exception as details:
+ print("Ebizzy workload trigger failed ", details)
sys.exit(1)
def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
@@ -385,7 +385,7 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
if workload_file != "":
benchmark_path = path
else:
- print "INFO: kernbench benchmark not found"
+ print("INFO: kernbench benchmark not found")
os.chdir(olddir)
sys.exit(1)
@@ -398,8 +398,8 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
if linux_source_dir != "":
os.chdir(linux_source_dir)
else:
- print "INFO: Linux kernel source not found in /root. Workload\
- Kernbench cannot be executed"
+ print("INFO: Linux kernel source not found in /root. Workload\
+ Kernbench cannot be executed")
sys.exit(1)
get_proc_data(stats_start)
@@ -428,10 +428,10 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
time.sleep(240)
stop_wkld("kernbench")
- print "INFO: Workload kernbench triggerd"
+ print("INFO: Workload kernbench triggerd")
os.chdir(olddir)
- except Exception, details:
- print "Workload kernbench trigger failed ", details
+ except Exception as details:
+ print("Workload kernbench trigger failed ", details)
sys.exit(1)
def trigger_workld(sched_smt, workload, stress, duration, background, pinned, perf_test):
@@ -443,8 +443,8 @@ def trigger_workld(sched_smt, workload, stress, duration, background, pinned, pe
trigger_ebizzy (sched_smt, stress, duration, background, pinned)
if workload == "kernbench":
trigger_kernbench (sched_smt, stress, background, pinned, perf_test)
- except Exception, details:
- print "INFO: Trigger workload failed", details
+ except Exception as details:
+ print("INFO: Trigger workload failed", details)
sys.exit(1)
def generate_report():
@@ -472,29 +472,29 @@ def generate_report():
stats_percentage[l] = percentage_list
for i in range(0, len(cpu_labels)):
- print >> debugfile, cpu_labels[i], '\t',
- print >> debugfile
+ print(cpu_labels[i], '\t', end=' ', file=debugfile)
+ print(file=debugfile)
for l in sorted(stats_stop.keys()):
- print >> debugfile, l, '\t',
+ print(l, '\t', end=' ', file=debugfile)
for i in range(1, len(stats_stop[l])):
- print >> debugfile, stats_stop[l][i], '\t',
- print >> debugfile
+ print(stats_stop[l][i], '\t', end=' ', file=debugfile)
+ print(file=debugfile)
for i in range(0, len(cpu_labels)):
- print >> reportfile, cpu_labels[i], '\t',
- print >> reportfile
+ print(cpu_labels[i], '\t', end=' ', file=reportfile)
+ print(file=reportfile)
for l in sorted(stats_percentage.keys()):
- print >> reportfile, l, '\t',
+ print(l, '\t', end=' ', file=reportfile)
for i in range(1, len(stats_percentage[l])):
- print >> reportfile, " %3.4f" % stats_percentage[l][i],
- print >> reportfile
+ print(" %3.4f" % stats_percentage[l][i], end=' ', file=reportfile)
+ print(file=reportfile)
#Now get the package ID information
try:
- print >> debugfile, "cpu_map: ", cpu_map
+ print("cpu_map: ", cpu_map, file=debugfile)
keyvalfile = open('/procstat/keyval', 'a')
- print >> keyvalfile, "nr_packages=%d" % len(cpu_map)
- print >> keyvalfile, "system-idle=%3.4f" % (stats_percentage['cpu'][4])
+ print("nr_packages=%d" % len(cpu_map), file=keyvalfile)
+ print("system-idle=%3.4f" % (stats_percentage['cpu'][4]), file=keyvalfile)
for pkg in sorted(cpu_map.keys()):
if is_hyper_threaded():
for core in sorted(cpu_map[pkg].keys()):
@@ -511,20 +511,20 @@ def generate_report():
total_idle += stats_stop["cpu%d" % cpu][4]
for i in range(1, len(stats_stop["cpu%d" % cpu])):
total += stats_stop["cpu%d" % cpu][i]
- print >> reportfile, "Package: ", pkg, "Idle %3.4f%%" \
- % (float(total_idle)*100/total)
- print >> keyvalfile, "package-%s=%3.4f" % \
- (pkg, (float(total_idle)*100/total))
- except Exception, details:
- print "Generating utilization report failed: ", details
+ print("Package: ", pkg, "Idle %3.4f%%" \
+ % (float(total_idle)*100/total), file=reportfile)
+ print("package-%s=%3.4f" % \
+ (pkg, (float(total_idle)*100/total)), file=keyvalfile)
+ except Exception as details:
+ print("Generating utilization report failed: ", details)
sys.exit(1)
#Add record delimiter '\n' before closing these files
- print >> debugfile
+ print(file=debugfile)
debugfile.close()
- print >> reportfile
+ print(file=reportfile)
reportfile.close()
- print >> keyvalfile
+ print(file=keyvalfile)
keyvalfile.close()
def generate_loc_intr_report():
@@ -537,17 +537,17 @@ def generate_loc_intr_report():
get_proc_loc_count(intr_stop)
reportfile = open('/procstat/cpu-loc_interrupts', 'a')
- print >> reportfile, "=============================================="
- print >> reportfile, " Local timer interrupt stats "
- print >> reportfile, "=============================================="
+ print("==============================================", file=reportfile)
+ print(" Local timer interrupt stats ", file=reportfile)
+ print("==============================================", file=reportfile)
for i in range(0, cpu_count):
intr_stop[i] = int(intr_stop[i]) - int(intr_start[i])
- print >> reportfile, "CPU%s: %s" %(i, intr_stop[i])
- print >> reportfile
+ print("CPU%s: %s" %(i, intr_stop[i]), file=reportfile)
+ print(file=reportfile)
reportfile.close()
- except Exception, details:
- print "Generating interrupt report failed: ", details
+ except Exception as details:
+ print("Generating interrupt report failed: ", details)
sys.exit(1)
def record_loc_intr_count():
@@ -560,8 +560,8 @@ def record_loc_intr_count():
intr_stat_timer_0.append(intr_stop[i])
intr_start = []
intr_stop = []
- except Exception, details:
- print "INFO: Record interrupt statistics when timer_migration=0",details
+ except Exception as details:
+ print("INFO: Record interrupt statistics when timer_migration=0",details)
def expand_range(range_val):
'''
@@ -578,8 +578,8 @@ def expand_range(range_val):
for j in range(int(hyphen_values[0]), int(hyphen_values[1])+1):
ids_list.append(j)
return(ids_list)
- except Exception, details:
- print "INFO: expand_pkg_grps failed ", details
+ except Exception as details:
+ print("INFO: expand_pkg_grps failed ", details)
def is_quad_core():
'''
@@ -596,8 +596,8 @@ def is_quad_core():
return(1)
else:
return(0)
- except IOError, e:
- print "Failed to get cpu core information", e
+ except IOError as e:
+ print("Failed to get cpu core information", e)
sys.exit(1)
def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
@@ -640,8 +640,8 @@ def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
return(1)
- except Exception, details:
- print "Exception in validate_cpugrp_map: ", details
+ except Exception as details:
+ print("Exception in validate_cpugrp_map: ", details)
sys.exit(1)
@@ -680,8 +680,8 @@ def verify_sched_domain_dmesg(sched_mc_level, sched_smt_level):
return(0)
else:
return(1)
- except Exception, details:
- print "Reading dmesg failed", details
+ except Exception as details:
+ print("Reading dmesg failed", details)
sys.exit(1)
def get_cpu_utilization(cpu):
@@ -692,8 +692,8 @@ def get_cpu_utilization(cpu):
if cpu == stats_percentage[l][0]:
return stats_percentage[l][1]
return -1
- except Exception, details:
- print "Exception in get_cpu_utilization", details
+ except Exception as details:
+ print("Exception in get_cpu_utilization", details)
sys.exit(1)
def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level):
@@ -737,7 +737,7 @@ def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level)
if stats_percentage[l][1] > 70:
cpus_utilized.append(int(cpu_id[1]))
cpus_utilized.sort()
- print "INFO: CPU's utilized ", cpus_utilized
+ print("INFO: CPU's utilized ", cpus_utilized)
# If length of CPU's utilized is not = number of jobs exit with 1
if len(cpus_utilized) < threads:
@@ -746,11 +746,11 @@ def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level)
status = validate_cpugrp_map(cpus_utilized, sched_mc_level, \
sched_smt_level)
if status == 1:
- print "INFO: CPUs utilized is not in same package or core"
+ print("INFO: CPUs utilized is not in same package or core")
return(status)
- except Exception, details:
- print "Exception in validate_cpu_consolidation: ", details
+ except Exception as details:
+ print("Exception in validate_cpu_consolidation: ", details)
sys.exit(1)
def get_cpuid_max_intr_count():
@@ -780,13 +780,13 @@ def get_cpuid_max_intr_count():
diff = second_highest - intr_stop[i]
''' Threshold of difference has to be manipulated '''
if diff < 10000:
- print "INFO: Diff in interrupt count is below threshold"
+ print("INFO: Diff in interrupt count is below threshold")
cpus_utilized = []
return cpus_utilized
- print "INFO: Interrupt count in other CPU's low as expected"
+ print("INFO: Interrupt count in other CPU's low as expected")
return cpus_utilized
- except Exception, details:
- print "Exception in get_cpuid_max_intr_count: ", details
+ except Exception as details:
+ print("Exception in get_cpuid_max_intr_count: ", details)
sys.exit(1)
def validate_ilb (sched_mc_level, sched_smt_level):
@@ -799,8 +799,8 @@ def validate_ilb (sched_mc_level, sched_smt_level):
status = validate_cpugrp_map(cpus_utilized, sched_mc_level, sched_smt_level)
return status
- except Exception, details:
- print "Exception in validate_ilb: ", details
+ except Exception as details:
+ print("Exception in validate_ilb: ", details)
sys.exit(1)
def reset_schedmc():
@@ -809,8 +809,8 @@ def reset_schedmc():
try:
os.system('echo 0 > \
/sys/devices/system/cpu/sched_mc_power_savings 2>/dev/null')
- except OSError, e:
- print "Could not set sched_mc_power_savings to 0", e
+ except OSError as e:
+ print("Could not set sched_mc_power_savings to 0", e)
sys.exit(1)
def reset_schedsmt():
@@ -819,8 +819,8 @@ def reset_schedsmt():
try:
os.system('echo 0 > \
/sys/devices/system/cpu/sched_smt_power_savings 2>/dev/null')
- except OSError, e:
- print "Could not set sched_smt_power_savings to 0", e
+ except OSError as e:
+ print("Could not set sched_smt_power_savings to 0", e)
sys.exit(1)
def stop_wkld(work_ld):
@@ -830,6 +830,6 @@ def stop_wkld(work_ld):
os.system('pkill %s 2>/dev/null' %work_ld)
if work_ld == "kernbench":
os.system('pkill make 2>/dev/null')
- except OSError, e:
- print "Exception in stop_wkld", e
+ except OSError as e:
+ print("Exception in stop_wkld", e)
sys.exit(1)
diff --git a/testcases/kernel/power_management/pm_cpu_consolidation.py b/testcases/kernel/power_management/pm_cpu_consolidation.py
index 734db2759..0a1772806 100755
--- a/testcases/kernel/power_management/pm_cpu_consolidation.py
+++ b/testcases/kernel/power_management/pm_cpu_consolidation.py
@@ -79,7 +79,7 @@ def main(argv=None):
generate_report()
status = validate_cpu_consolidation("partial", work_ld, options.mc_value, options.smt_value)
if status == 0:
- print "INFO: Consolidation worked sched_smt &(/) sched_mc is set"
+ print("INFO: Consolidation worked sched_smt &(/) sched_mc is set")
#Disable sched_smt & sched_mc interface values
if options.vary_mc_smt and options.mc_value > 0:
set_sched_mc_power(0)
@@ -107,8 +107,8 @@ def main(argv=None):
else:
return(1)
else:
- print "INFO: CPU consolidation failed when sched_mc &(/) \
-sched_smt was enabled. This is pre-requisite to proceed"
+ print("INFO: CPU consolidation failed when sched_mc &(/) \
+sched_smt was enabled. This is pre-requisite to proceed")
return(status)
else:
#The else part of the code validates behaviour of sched_mc
@@ -118,7 +118,7 @@ sched_smt was enabled. This is pre-requisite to proceed"
if is_hyper_threaded():
set_sched_smt_power(options.smt_value)
map_cpuid_pkgid()
- print "INFO: Created table mapping cpu to package"
+ print("INFO: Created table mapping cpu to package")
background="no"
duration=60
pinned ="no"
@@ -135,8 +135,8 @@ sched_smt was enabled. This is pre-requisite to proceed"
if is_hyper_threaded():
reset_schedsmt()
return(status)
- except Exception, details:
- print "INFO: CPU consolidation failed", details
+ except Exception as details:
+ print("INFO: CPU consolidation failed", details)
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_ilb_test.py b/testcases/kernel/power_management/pm_ilb_test.py
index 0b447d804..749c0273e 100755
--- a/testcases/kernel/power_management/pm_ilb_test.py
+++ b/testcases/kernel/power_management/pm_ilb_test.py
@@ -36,7 +36,7 @@ def main(argv=None):
if is_hyper_threaded():
set_sched_smt_power(options.smt_level)
map_cpuid_pkgid()
- print "INFO: Created table mapping cpu to package"
+ print("INFO: Created table mapping cpu to package")
background="no"
duration=120
pinned="yes"
@@ -49,8 +49,8 @@ def main(argv=None):
reset_schedsmt()
return(status)
- except Exception, details:
- print "INFO: Idle Load Balancer test failed", details
+ except Exception as details:
+ print("INFO: Idle Load Balancer test failed", details)
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_sched_domain.py b/testcases/kernel/power_management/pm_sched_domain.py
index a54b0e9be..f6fd5ae99 100755
--- a/testcases/kernel/power_management/pm_sched_domain.py
+++ b/testcases/kernel/power_management/pm_sched_domain.py
@@ -43,10 +43,10 @@ def main(argv=None):
reset_schedsmt()
return(status)
else:
- print "INFO: Invalid arguments given"
+ print("INFO: Invalid arguments given")
return 1
- except Exception, details:
- print "INFO: sched domain test failed: ", details
+ except Exception as details:
+ print("INFO: sched domain test failed: ", details)
return(1)
# Run test based on the command line arguments
diff --git a/testcases/network/nfsv4/acl/cleangroups.py b/testcases/network/nfsv4/acl/cleangroups.py
index 341746e83..fbf5dcbf7 100755
--- a/testcases/network/nfsv4/acl/cleangroups.py
+++ b/testcases/network/nfsv4/acl/cleangroups.py
@@ -1,6 +1,6 @@
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/cleanusers.py b/testcases/network/nfsv4/acl/cleanusers.py
index 7ac435087..ef9088449 100755
--- a/testcases/network/nfsv4/acl/cleanusers.py
+++ b/testcases/network/nfsv4/acl/cleanusers.py
@@ -1,6 +1,6 @@
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/random_gen.py b/testcases/network/nfsv4/acl/random_gen.py
index d39dbb3db..dcf63860a 100755
--- a/testcases/network/nfsv4/acl/random_gen.py
+++ b/testcases/network/nfsv4/acl/random_gen.py
@@ -1,4 +1,4 @@
-import commands
+import subprocess
import random
import re
@@ -30,20 +30,20 @@ class RandomGen(object):
def createUser(self,username):
group = self.gList[random.randint(0,len(self.gList)-1)][0]
opts = "-g" + group + " -p" + "1pilot" + " -m " + username
- u = commands.getoutput('/usr/sbin/useradd '+ opts)
+ u = subprocess.getoutput('/usr/sbin/useradd '+ opts)
if u != "":
- print "create user " + username + "failed" + u
+ print("create user " + username + "failed" + u)
def createFile(self,path,n):
for i in range(n):
fName = 'file' + str(i)
- u = commands.getoutput('touch ' + path + '/'+ fName)
+ u = subprocess.getoutput('touch ' + path + '/'+ fName)
self.fList.append(fName)
def createGroup(self, grpname, gid):
- u = commands.getoutput('/usr/sbin/groupadd -g' + gid + " " + grpname)
+ u = subprocess.getoutput('/usr/sbin/groupadd -g' + gid + " " + grpname)
if u != "":
- print u
+ print(u)
def createNGroup(self, n):
for i in range(n):
@@ -61,13 +61,13 @@ class RandomGen(object):
""" clean all users created to do the tests """
def cleanUsers(self):
for name in self.uList:
- u = commands.getoutput('/usr/sbin/userdel -r '+ name)
+ u = subprocess.getoutput('/usr/sbin/userdel -r '+ name)
self.uList = []
""" clean all users created to do the tests """
def cleanGroups(self):
for name in self.gList:
- u = commands.getoutput('/usr/sbin/groupdel '+ name[0])
+ u = subprocess.getoutput('/usr/sbin/groupdel '+ name[0])
self.gList = []
""" Retrieve the list of user from /etc/passwd file """
@@ -86,7 +86,7 @@ class RandomGen(object):
f.close()
def getFileList(self,path):
- u = commands.getoutput('ls ' + path)
+ u = subprocess.getoutput('ls ' + path)
tmp = u.split('\n')
for i in range (len(tmp)-1):
NameOK = re.match("file",tmp[i])
@@ -142,10 +142,10 @@ class RandomGen(object):
f.close()
def printUserList(self):
- print self.uList
+ print(self.uList)
def printGroupList(self):
- print self.gList
+ print(self.gList)
""" Create a random name of random length """
def createOneNameRandomLength(self,maxlength):
@@ -211,19 +211,19 @@ class RandomGen(object):
file = self.fList[random.randint(0,len(self.fList)-1)]
if a == 1: # creation/modification
user = self.uList[random.randint(0,len(self.uList)-1)]
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + file)
if a == 2: # with group
group = self.gList[random.randint(0,len(self.gList)-1)][0]
- u = commands.getoutput('setfacl -m g:' + group + ':' + mode + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -m g:' + group + ':' + mode + " " + path + "/" + file)
if a == 3: # deletation
user = self.uList[random.randint(0,len(self.uList)-1)]
- u = commands.getoutput('setfacl -x u:' + user + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -x u:' + user + " " + path + "/" + file)
if a == 4: # with group
group = self.gList[random.randint(0,len(self.gList)-1)][0]
- u = commands.getoutput('setfacl -x g:' + group + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -x g:' + group + " " + path + "/" + file)
# request on a unexisting group
'''if a == 5:
diff --git a/testcases/network/nfsv4/acl/setacl_stress.py b/testcases/network/nfsv4/acl/setacl_stress.py
index 3713ff6a9..2001e9f78 100755
--- a/testcases/network/nfsv4/acl/setacl_stress.py
+++ b/testcases/network/nfsv4/acl/setacl_stress.py
@@ -6,7 +6,7 @@
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/test_long_acl.py b/testcases/network/nfsv4/acl/test_long_acl.py
index a7c8cb1a1..8b3c33b84 100755
--- a/testcases/network/nfsv4/acl/test_long_acl.py
+++ b/testcases/network/nfsv4/acl/test_long_acl.py
@@ -4,7 +4,7 @@
'''
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import threading
import time
@@ -19,20 +19,20 @@ def test_longacl(l,path):
# mesures sur le getfacl
test = RandomGen()
- u = commands.getoutput('rm ' + path + "/*") # clean directory
- print "test acl getfacl\n"
+ u = subprocess.getoutput('rm ' + path + "/*") # clean directory
+ print("test acl getfacl\n")
for i in range(l):
test.getUserList()
testfile = 'testfile' + str(i)
- u = commands.getoutput('touch ' + path + "/" + testfile)
- print "setfacl with " + str(i) + " entries\n " + u
+ u = subprocess.getoutput('touch ' + path + "/" + testfile)
+ print("setfacl with " + str(i) + " entries\n " + u)
for j in range(i):
user = test.uList.pop()
mode = test.createRandomMode()
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
if u != "":
- print "setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile
- print u
+ print("setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile)
+ print(u)
def main():
parser = OptionParser()
parser.add_option("-l", "--length", dest="length",type="int",help="max lentgh of ACL")
diff --git a/testcases/network/nfsv4/locks/locktests.py b/testcases/network/nfsv4/locks/locktests.py
index dd518ab6e..6aa9392b2 100755
--- a/testcases/network/nfsv4/locks/locktests.py
+++ b/testcases/network/nfsv4/locks/locktests.py
@@ -38,8 +38,8 @@ class Machine:
self.do()
def printc(self):
- print "->"+self.command
- print "\n"
+ print("->"+self.command)
+ print("\n")
class Client(Machine):
@@ -95,25 +95,25 @@ class Serveur(Machine):
self.unexport(unexportDir)
self.rmdir(unexportDir)
def usage():
- print "\n"
- print "usage:"
- print "locktests.py <-n process -f testfile ><--setup -s fs_server> -c host1, host2, host3 ... "
- print "--setup : setup the configuration, deploy test on other test machines; This option also requires -c and -s"
- print "-c <machine> : host list to deploy/run/clean the test"
- print "-s <machine> : NFS server to use to setup the test"
- print "-n <num> : number of processes each test machine will lauch to perform the test"
- print "-f <file> : test file. This must be the same on each machine"
- print " "
- print "Example :"
- print "========="
- print "*Setup machines for testing"
- print "./locktests.py --setup -c testmachine1 testmachine2 testmachine3 -s my_nfs_server:/"
- print "\n"
- print "*Run test on testmachine1,testmachine2 with 50 process on each machine using /mnt/nfsv4/testfile"
- print "./locktests.py -n 50 -f /mnt/nfsv4/testfile -c testmachine1 testmachine2"
- print "\n"
- print "_________________________________"
- print "Vincent ROQUETA - Bull SA - 2005\n"
+ print("\n")
+ print("usage:")
+ print("locktests.py <-n process -f testfile ><--setup -s fs_server> -c host1, host2, host3 ... ")
+ print("--setup : setup the configuration, deploy test on other test machines; This option also requires -c and -s")
+ print("-c <machine> : host list to deploy/run/clean the test")
+ print("-s <machine> : NFS server to use to setup the test")
+ print("-n <num> : number of processes each test machine will lauch to perform the test")
+ print("-f <file> : test file. This must be the same on each machine")
+ print(" ")
+ print("Example :")
+ print("=========")
+ print("*Setup machines for testing")
+ print("./locktests.py --setup -c testmachine1 testmachine2 testmachine3 -s my_nfs_server:/")
+ print("\n")
+ print("*Run test on testmachine1,testmachine2 with 50 process on each machine using /mnt/nfsv4/testfile")
+ print("./locktests.py -n 50 -f /mnt/nfsv4/testfile -c testmachine1 testmachine2")
+ print("\n")
+ print("_________________________________")
+ print("Vincent ROQUETA - Bull SA - 2005\n")
return 0
@@ -124,14 +124,14 @@ def setup():
fichier=SRC_PATH+"/"+SRC
commande=""
for i in clients:
- print "Setting up machine "+i
+ print("Setting up machine "+i)
c=Client(i)
c.mkdir(path)
c.cp(fichier, path)
c.install(path)
c.isomount(NFS4_PATH)
#Setup localhost
- print "Setting up localhost"
+ print("Setting up localhost")
commande="make; mkdir -p "+NFS4_PATH+" ; mount -t nfs4 "+NFS4_SERVER+" "+NFS4_PATH+" &"
os.system(commande)
@@ -159,7 +159,7 @@ def clean():
args=sys.argv[1:]
-rge=range(len(args))
+rge=list(range(len(args)))
a=""
r=True
s=False
@@ -213,17 +213,17 @@ if s:
if (not c) or (not nfsServer):
usage()
sys.exit(1)
- print "Setup"
- print NFS4_SERVER
+ print("Setup")
+ print(NFS4_SERVER)
setup()
- print "Setup complete"
+ print("Setup complete")
if r:
if (not c) or (not f) or (not n):
usage()
sys.exit(1)
- print "Running test"
+ print("Running test")
run()
diff --git a/testcases/realtime/scripts/parser.py b/testcases/realtime/scripts/parser.py
index 6b2dc7370..d43ce5318 100644
--- a/testcases/realtime/scripts/parser.py
+++ b/testcases/realtime/scripts/parser.py
@@ -34,7 +34,7 @@ class Log:
log_file=filename
try:
self.__log_file = open(log_file, "r")
- except IOError, errmsg:
+ except IOError as errmsg:
sys.exit(errmsg)
def read(self):
diff --git a/testcases/realtime/tools/ftqviz.py b/testcases/realtime/tools/ftqviz.py
index 19ae093a0..22f102e53 100644
--- a/testcases/realtime/tools/ftqviz.py
+++ b/testcases/realtime/tools/ftqviz.py
@@ -37,7 +37,7 @@ NS_PER_US = 1000
def smooth(x, wlen):
if x.size < wlen:
- raise ValueError, "Input vector needs to be bigger than window size."
+ raise ValueError("Input vector needs to be bigger than window size.")
# reflect the signal to avoid transients... ?
s = r_[2*x[0]-x[wlen:1:-1], x, 2*x[-1]-x[-1:-wlen:-1]]
@@ -62,8 +62,8 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# same factor
ns_per_sample = NS_PER_S / sample_hz
- print "Interpolated Sample Rate: ", sample_hz, " HZ"
- print "Hamming Window Length: ", wlen
+ print("Interpolated Sample Rate: ", sample_hz, " HZ")
+ print("Hamming Window Length: ", wlen)
t = fromfile(timefile, dtype=int64, sep='\n')
x = fromfile(countfile, dtype=int64, sep='\n')
@@ -83,7 +83,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# smooth the signal (low pass filter)
try:
y = smooth(xi, wlen)
- except ValueError, e:
+ except ValueError as e:
exit(e)
# generate the fft
@@ -121,7 +121,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
def usage():
- print "usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]"
+ print("usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]")
if __name__=='__main__':
@@ -143,7 +143,7 @@ if __name__=='__main__':
usage()
exit()
if o == "-s":
- sample_hz = long(a)
+ sample_hz = int@
if o == "-t":
times_file = a
if o == "-w":
diff --git a/testscripts/build/ltp-missing-install-files.py b/testscripts/build/ltp-missing-install-files.py
index 1ab40a09f..a1af30e48 100755
--- a/testscripts/build/ltp-missing-install-files.py
+++ b/testscripts/build/ltp-missing-install-files.py
@@ -111,6 +111,6 @@ for logfile in logfiles:
fd.close()
if len(missing_ents):
- print "\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents])
+ print("\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents]))
elif opts.verbose:
- print "%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile)
+ print("%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile))
diff --git a/tools/pounder21/src/time_tests/drift-test.py b/tools/pounder21/src/time_tests/drift-test.py
index aba1909e3..c765d6f4b 100755
--- a/tools/pounder21/src/time_tests/drift-test.py
+++ b/tools/pounder21/src/time_tests/drift-test.py
@@ -24,7 +24,7 @@
# Usage: drift-test.py [-s] [ntp_server [sleep_time]]
-import commands
+import subprocess
import sys
import string
import time
@@ -52,9 +52,9 @@ if sleep_time == 0:
#set time
if (set_time == 1):
- cmd = commands.getoutput('/usr/sbin/ntpdate -ub ' + server)
+ cmd = subprocess.getoutput('/usr/sbin/ntpdate -ub ' + server)
-cmd = commands.getoutput('/usr/sbin/ntpdate -uq ' + server)
+cmd = subprocess.getoutput('/usr/sbin/ntpdate -uq ' + server)
line = string.split(cmd)
#parse original offset
@@ -65,7 +65,7 @@ datestr = time.strftime("%d %b %Y %H:%M:%S", start_time)
time.sleep(1)
while 1:
- cmd = commands.getoutput('/usr/sbin/ntpdate -uq ' + server)
+ cmd = subprocess.getoutput('/usr/sbin/ntpdate -uq ' + server)
line = string.split(cmd)
#parse offset
@@ -81,9 +81,9 @@ while 1:
drift = delta_offset / delta_time * 1000000
#print output
- print time.strftime("%d %b %H:%M:%S",now_time),
- print " offset:", now_offset ,
- print " drift:", drift ,"ppm"
+ print(time.strftime("%d %b %H:%M:%S",now_time), end=' ')
+ print(" offset:", now_offset, end=' ')
+ print(" drift:", drift ,"ppm")
sys.stdout.flush()
#sleep
--
2.13.6
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH] *.py : convert python2 to python3
2018-04-19 16:01 ` Cyril Hrubis
@ 2018-04-20 10:09 ` Petr Vorel
2018-04-23 3:06 ` Yong Sun
0 siblings, 1 reply; 12+ messages in thread
From: Petr Vorel @ 2018-04-20 10:09 UTC (permalink / raw)
To: ltp
Hi,
> Looks good but shouldn't we update hashbangs to python3 since these
> changes effectively make the code python3 only?
I wonder whether we should use env shebang, which is portable (#!/usr/bin/env python3) or
standard shebang using in distros (#!/usr/bin/python3). I've seen both in various
projects, some of them even use no shebang at all.
> Also there is execltp.in that is written in python, have you looked at
> that source? Is that one python3 compatible?
OK, 21 python scripts (some of the scripts doesn't have shebang).
Kind regards,
Petr
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH] *.py : convert python2 to python3
2018-04-20 10:09 ` Petr Vorel
@ 2018-04-23 3:06 ` Yong Sun
0 siblings, 0 replies; 12+ messages in thread
From: Yong Sun @ 2018-04-23 3:06 UTC (permalink / raw)
To: ltp
Hi,
> > Looks good but shouldn't we update hashbangs to python3 since these
> > changes effectively make the code python3 only?
> I wonder whether we should use env shebang, which is portable (#!/usr/bin/env python3) or
> standard shebang using in distros (#!/usr/bin/python3). I've seen both in various
> projects, some of them even use no shebang at all.
>
I'm going to update/add all shebang to standard shebang (#!/usr/bin/python3)
> > Also there is execltp.in that is written in python, have you looked at
> > that source? Is that one python3 compatible?
> OK, 21 python scripts (some of the scripts doesn't have shebang).
>
All these 21 python scripts will have the same shebang. Thank you both for reviewing :)
Best Wishes,
Yong
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20180422/7fd2bd07/attachment.html>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH v2] *.py : convert python2 to python3
2018-04-19 10:10 [LTP] [PATCH] *.py : convert python2 to python3 Yong Sun
` (2 preceding siblings ...)
2018-04-20 10:00 ` Yong Sun
@ 2018-04-23 3:32 ` Yong Sun
2018-04-23 6:55 ` Petr Vorel
2018-04-23 8:12 ` [LTP] [PATCH v3] " Yong Sun
4 siblings, 1 reply; 12+ messages in thread
From: Yong Sun @ 2018-04-23 3:32 UTC (permalink / raw)
To: ltp
From: yosun <yosun@suse.com>
1.Convert python code to use python3
2.Make shebang same as standard python shebang
Signed-off-by: Yong Sun <yosun@suse.com>
---
execltp.in | 12 +-
testcases/commands/file/datafiles/in.py | 2 +-
.../kernel/power_management/lib/pm_sched_mc.py | 218 ++++++++++-----------
.../power_management/pm_cpu_consolidation.py | 14 +-
testcases/kernel/power_management/pm_ilb_test.py | 8 +-
.../kernel/power_management/pm_sched_domain.py | 8 +-
testcases/network/nfsv4/acl/cleangroups.py | 3 +-
testcases/network/nfsv4/acl/cleanusers.py | 3 +-
testcases/network/nfsv4/acl/create_users.py | 1 +
testcases/network/nfsv4/acl/random_gen.py | 31 +--
testcases/network/nfsv4/acl/setacl_stress.py | 3 +-
testcases/network/nfsv4/acl/test_acl.py | 1 +
testcases/network/nfsv4/acl/test_long_acl.py | 17 +-
testcases/network/nfsv4/locks/locktests.py | 58 +++---
testcases/realtime/func/pi-tests/parse-testpi1.py | 1 +
testcases/realtime/func/pi-tests/parse-testpi2.py | 1 +
testcases/realtime/scripts/parser.py | 3 +-
testcases/realtime/tools/ftqviz.py | 14 +-
testscripts/build/ltp-missing-install-files.py | 6 +-
tools/pounder21/src/time_tests/drift-test.py | 16 +-
20 files changed, 215 insertions(+), 205 deletions(-)
diff --git a/execltp.in b/execltp.in
index 10b1f53f3..57e9c45a5 100755
--- a/execltp.in
+++ b/execltp.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
"""
An LTP [execution and] parsing wrapper.
@@ -146,7 +146,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
while True:
- line = line_iterator.next()
+ line = next(line_iterator)
if line.startswith(end_output):
@@ -161,7 +161,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
while True:
- line = line_iterator.next()
+ line = next(line_iterator)
match = tag_re.match(line)
@@ -177,7 +177,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
except StopIteration:
pass
- for k in context.keys():
+ for k in list(context.keys()):
if k not in search_tags:
raise ResultsParseException('Leftover token in search '
'keys: %s' % k)
@@ -219,7 +219,7 @@ def print_context(output_dest, header, testsuite_context):
output_dest.write('\n'.join(['', '=' * 40, header, '-' * 40, '']))
- for test, context in testsuite_context.items():
+ for test, context in list(testsuite_context.items()):
output_dest.write('<output test="%s">\n%s\n</output>\n' %
(test, context.strip()))
@@ -302,7 +302,7 @@ def main():
if not opts.summary_mode and not opts.verbose:
parser.error('You cannot suppress summary output and disable '
'verbosity.')
- elif opts.summary_mode not in range(3):
+ elif opts.summary_mode not in list(range(3)):
parser.error('--summary-mode must be a value between 0 and 2.')
if len(args) == 0:
diff --git a/testcases/commands/file/datafiles/in.py b/testcases/commands/file/datafiles/in.py
index 26f54ffd2..802e7bf98 100755
--- a/testcases/commands/file/datafiles/in.py
+++ b/testcases/commands/file/datafiles/in.py
@@ -1,3 +1,3 @@
-#!/usr/bin/python
+#!/usr/bin/python3
print("This is a test.")
diff --git a/testcases/kernel/power_management/lib/pm_sched_mc.py b/testcases/kernel/power_management/lib/pm_sched_mc.py
index feb4b24d3..3574330a1 100755
--- a/testcases/kernel/power_management/lib/pm_sched_mc.py
+++ b/testcases/kernel/power_management/lib/pm_sched_mc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
''' Reusable functions related to sched mc FVT are put together
'''
@@ -30,8 +30,8 @@ def clear_dmesg():
'''
try:
os.system('dmesg -c >/dev/null')
- except OSError, e:
- print 'Clearing dmesg failed', e
+ except OSError as e:
+ print('Clearing dmesg failed', e)
sys.exit(1)
def count_num_cpu():
@@ -44,8 +44,8 @@ def count_num_cpu():
if line.startswith('processor'):
cpu_count += 1
cpuinfo.close()
- except IOError, e:
- print "Could not get cpu count", e
+ except IOError as e:
+ print("Could not get cpu count", e)
sys.exit(1)
def count_num_sockets():
@@ -61,8 +61,8 @@ def count_num_sockets():
if socket_id not in socket_list:
socket_list.append(socket_id)
socket_count = socket_count + 1
- except Exception, details:
- print "INFO: Failed to get number of sockets in system", details
+ except Exception as details:
+ print("INFO: Failed to get number of sockets in system", details)
sys.exit(1)
def is_multi_socket():
@@ -74,7 +74,7 @@ def is_multi_socket():
else:
return 0
except Exception:
- print "Failed to check if system is multi socket system"
+ print("Failed to check if system is multi socket system")
sys.exit(1)
def is_hyper_threaded():
@@ -94,7 +94,7 @@ def is_hyper_threaded():
else:
return 0
except Exception:
- print "Failed to check if system is hyper-threaded"
+ print("Failed to check if system is hyper-threaded")
sys.exit(1)
def is_multi_core():
@@ -124,7 +124,7 @@ def is_multi_core():
file_cpuinfo.close()
return multi_core
except Exception:
- print "Failed to check if system is multi core system"
+ print("Failed to check if system is multi core system")
sys.exit(1)
def get_hyper_thread_count():
@@ -142,7 +142,7 @@ def get_hyper_thread_count():
break
return( int( siblings[1] ) / int( cpu_cores[1] ) )
except Exception:
- print "Failed to check if system is hyper-threaded"
+ print("Failed to check if system is hyper-threaded")
sys.exit(1)
def map_cpuid_pkgid():
@@ -158,17 +158,17 @@ def map_cpuid_pkgid():
core_file += '/topology/core_id'
core_id = open(core_file).read().rstrip()
cpu_phy_id = open(phy_pkg_file).read().rstrip()
- if not cpu_phy_id in cpu_map.keys():
+ if not cpu_phy_id in list(cpu_map.keys()):
core_info = {}
else:
core_info = cpu_map[cpu_phy_id]
- if not core_id in core_info.keys():
+ if not core_id in list(core_info.keys()):
core_info[core_id] = [i]
else:
core_info[core_id].append(i)
cpu_map[cpu_phy_id] = core_info
- except Exception, details:
- print "Package, core & cpu map table creation failed", e
+ except Exception as details:
+ print("Package, core & cpu map table creation failed", e)
sys.exit(1)
else:
for i in range(0, cpu_count):
@@ -176,12 +176,12 @@ def map_cpuid_pkgid():
phy_pkg_file = '/sys/devices/system/cpu/cpu%s' %i
phy_pkg_file += '/topology/physical_package_id'
cpu_phy_id = open(phy_pkg_file).read().rstrip()
- if not cpu_phy_id in cpu_map.keys():
+ if not cpu_phy_id in list(cpu_map.keys()):
cpu_map[cpu_phy_id] = [i]
else:
cpu_map[cpu_phy_id].append(i)
- except IOError, e:
- print "Mapping of CPU to pkg id failed", e
+ except IOError as e:
+ print("Mapping of CPU to pkg id failed", e)
sys.exit(1)
@@ -197,8 +197,8 @@ def generate_sibling_list():
if not thread_ids in siblings_list:
siblings_list.append(thread_ids)
- except Exception, details:
- print "Exception in generate_siblings_list", details
+ except Exception as details:
+ print("Exception in generate_siblings_list", details)
sys.exit(1)
def get_siblings(cpu_id):
@@ -215,8 +215,8 @@ def get_siblings(cpu_id):
cpus += j
return cpus
return cpus
- except Exception, details:
- print "Exception in get_siblings", details
+ except Exception as details:
+ print("Exception in get_siblings", details)
sys.exit(1)
def get_proc_data(stats_list):
@@ -229,8 +229,8 @@ def get_proc_data(stats_list):
data = line.split()
stats_list[data[0]] = data
file_procstat.close()
- except OSError, e:
- print "Could not read statistics", e
+ except OSError as e:
+ print("Could not read statistics", e)
sys.exit(1)
def get_proc_loc_count(loc_stats):
@@ -246,8 +246,8 @@ def get_proc_loc_count(loc_stats):
loc_stats.append(data[i+1])
file_procstat.close()
return
- except Exception, details:
- print "Could not read interrupt statistics", details
+ except Exception as details:
+ print("Could not read interrupt statistics", details)
sys.exit(1)
@@ -260,9 +260,9 @@ def set_sched_mc_power(sched_mc_level):
% sched_mc_level)
get_proc_data(stats_start)
- except OSError, e:
- print "Could not set sched_mc_power_savings to", sched_mc_level, e
- sys.exit(1)
+ except OSError as e:
+ print("Could not set sched_mc_power_savings to", sched_mc_level, e)
+ sys.exit(1)
def set_sched_smt_power(sched_smt_level):
''' Routine to set sched_smt_power_savings to required level
@@ -273,9 +273,9 @@ def set_sched_smt_power(sched_smt_level):
% sched_smt_level)
get_proc_data(stats_start)
- except OSError, e:
- print "Could not set sched_smt_power_savings to", sched_smt_level, e
- sys.exit(1)
+ except OSError as e:
+ print("Could not set sched_smt_power_savings to", sched_smt_level, e)
+ sys.exit(1)
def set_timer_migration_interface(value):
''' Set value of timer migration interface to a value
@@ -284,8 +284,8 @@ def set_timer_migration_interface(value):
try:
os.system('echo %s > \
/proc/sys/kernel/timer_migration 2>/dev/null' % value)
- except OSError, e:
- print "Could not set timer_migration to ", value, e
+ except OSError as e:
+ print("Could not set timer_migration to ", value, e)
sys.exit(1)
def get_job_count(stress, workload, sched_smt):
@@ -308,8 +308,8 @@ def get_job_count(stress, workload, sched_smt):
threads = 1
duration = 180
return threads
- except Exception, details:
- print "get job count failed ", details
+ except Exception as details:
+ print("get job count failed ", details)
sys.exit(1)
def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
@@ -328,7 +328,7 @@ def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
workload_file = file_name
break
if workload_file == "":
- print "INFO: ebizzy benchmark not found"
+ print("INFO: ebizzy benchmark not found")
os.chdir(olddir)
sys.exit(1)
get_proc_data(stats_start)
@@ -346,21 +346,21 @@ def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
% (threads, duration))
if succ == 0:
- print "INFO: ebizzy workload triggerd"
+ print("INFO: ebizzy workload triggerd")
os.chdir(olddir)
#Commented bcoz it doesnt make sense to capture it when workload triggered
#in background
#get_proc_loc_count(intr_stop)
#get_proc_data(stats_stop)
else:
- print "INFO: ebizzy workload triggerd failed"
+ print("INFO: ebizzy workload triggerd failed")
os.chdir(olddir)
sys.exit(1)
- except Exception, details:
- print "Ebizzy workload trigger failed ", details
+ except Exception as details:
+ print("Ebizzy workload trigger failed ", details)
sys.exit(1)
- except Exception, details:
- print "Ebizzy workload trigger failed ", details
+ except Exception as details:
+ print("Ebizzy workload trigger failed ", details)
sys.exit(1)
def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
@@ -385,7 +385,7 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
if workload_file != "":
benchmark_path = path
else:
- print "INFO: kernbench benchmark not found"
+ print("INFO: kernbench benchmark not found")
os.chdir(olddir)
sys.exit(1)
@@ -398,8 +398,8 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
if linux_source_dir != "":
os.chdir(linux_source_dir)
else:
- print "INFO: Linux kernel source not found in /root. Workload\
- Kernbench cannot be executed"
+ print("INFO: Linux kernel source not found in /root. Workload\
+ Kernbench cannot be executed")
sys.exit(1)
get_proc_data(stats_start)
@@ -428,10 +428,10 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
time.sleep(240)
stop_wkld("kernbench")
- print "INFO: Workload kernbench triggerd"
+ print("INFO: Workload kernbench triggerd")
os.chdir(olddir)
- except Exception, details:
- print "Workload kernbench trigger failed ", details
+ except Exception as details:
+ print("Workload kernbench trigger failed ", details)
sys.exit(1)
def trigger_workld(sched_smt, workload, stress, duration, background, pinned, perf_test):
@@ -443,8 +443,8 @@ def trigger_workld(sched_smt, workload, stress, duration, background, pinned, pe
trigger_ebizzy (sched_smt, stress, duration, background, pinned)
if workload == "kernbench":
trigger_kernbench (sched_smt, stress, background, pinned, perf_test)
- except Exception, details:
- print "INFO: Trigger workload failed", details
+ except Exception as details:
+ print("INFO: Trigger workload failed", details)
sys.exit(1)
def generate_report():
@@ -472,29 +472,29 @@ def generate_report():
stats_percentage[l] = percentage_list
for i in range(0, len(cpu_labels)):
- print >> debugfile, cpu_labels[i], '\t',
- print >> debugfile
+ print(cpu_labels[i], '\t', end=' ', file=debugfile)
+ print(file=debugfile)
for l in sorted(stats_stop.keys()):
- print >> debugfile, l, '\t',
+ print(l, '\t', end=' ', file=debugfile)
for i in range(1, len(stats_stop[l])):
- print >> debugfile, stats_stop[l][i], '\t',
- print >> debugfile
+ print(stats_stop[l][i], '\t', end=' ', file=debugfile)
+ print(file=debugfile)
for i in range(0, len(cpu_labels)):
- print >> reportfile, cpu_labels[i], '\t',
- print >> reportfile
+ print(cpu_labels[i], '\t', end=' ', file=reportfile)
+ print(file=reportfile)
for l in sorted(stats_percentage.keys()):
- print >> reportfile, l, '\t',
+ print(l, '\t', end=' ', file=reportfile)
for i in range(1, len(stats_percentage[l])):
- print >> reportfile, " %3.4f" % stats_percentage[l][i],
- print >> reportfile
+ print(" %3.4f" % stats_percentage[l][i], end=' ', file=reportfile)
+ print(file=reportfile)
#Now get the package ID information
try:
- print >> debugfile, "cpu_map: ", cpu_map
+ print("cpu_map: ", cpu_map, file=debugfile)
keyvalfile = open('/procstat/keyval', 'a')
- print >> keyvalfile, "nr_packages=%d" % len(cpu_map)
- print >> keyvalfile, "system-idle=%3.4f" % (stats_percentage['cpu'][4])
+ print("nr_packages=%d" % len(cpu_map), file=keyvalfile)
+ print("system-idle=%3.4f" % (stats_percentage['cpu'][4]), file=keyvalfile)
for pkg in sorted(cpu_map.keys()):
if is_hyper_threaded():
for core in sorted(cpu_map[pkg].keys()):
@@ -511,20 +511,20 @@ def generate_report():
total_idle += stats_stop["cpu%d" % cpu][4]
for i in range(1, len(stats_stop["cpu%d" % cpu])):
total += stats_stop["cpu%d" % cpu][i]
- print >> reportfile, "Package: ", pkg, "Idle %3.4f%%" \
- % (float(total_idle)*100/total)
- print >> keyvalfile, "package-%s=%3.4f" % \
- (pkg, (float(total_idle)*100/total))
- except Exception, details:
- print "Generating utilization report failed: ", details
+ print("Package: ", pkg, "Idle %3.4f%%" \
+ % (float(total_idle)*100/total), file=reportfile)
+ print("package-%s=%3.4f" % \
+ (pkg, (float(total_idle)*100/total)), file=keyvalfile)
+ except Exception as details:
+ print("Generating utilization report failed: ", details)
sys.exit(1)
#Add record delimiter '\n' before closing these files
- print >> debugfile
+ print(file=debugfile)
debugfile.close()
- print >> reportfile
+ print(file=reportfile)
reportfile.close()
- print >> keyvalfile
+ print(file=keyvalfile)
keyvalfile.close()
def generate_loc_intr_report():
@@ -537,17 +537,17 @@ def generate_loc_intr_report():
get_proc_loc_count(intr_stop)
reportfile = open('/procstat/cpu-loc_interrupts', 'a')
- print >> reportfile, "=============================================="
- print >> reportfile, " Local timer interrupt stats "
- print >> reportfile, "=============================================="
+ print("==============================================", file=reportfile)
+ print(" Local timer interrupt stats ", file=reportfile)
+ print("==============================================", file=reportfile)
for i in range(0, cpu_count):
intr_stop[i] = int(intr_stop[i]) - int(intr_start[i])
- print >> reportfile, "CPU%s: %s" %(i, intr_stop[i])
- print >> reportfile
+ print("CPU%s: %s" %(i, intr_stop[i]), file=reportfile)
+ print(file=reportfile)
reportfile.close()
- except Exception, details:
- print "Generating interrupt report failed: ", details
+ except Exception as details:
+ print("Generating interrupt report failed: ", details)
sys.exit(1)
def record_loc_intr_count():
@@ -560,8 +560,8 @@ def record_loc_intr_count():
intr_stat_timer_0.append(intr_stop[i])
intr_start = []
intr_stop = []
- except Exception, details:
- print "INFO: Record interrupt statistics when timer_migration=0",details
+ except Exception as details:
+ print("INFO: Record interrupt statistics when timer_migration=0",details)
def expand_range(range_val):
'''
@@ -578,8 +578,8 @@ def expand_range(range_val):
for j in range(int(hyphen_values[0]), int(hyphen_values[1])+1):
ids_list.append(j)
return(ids_list)
- except Exception, details:
- print "INFO: expand_pkg_grps failed ", details
+ except Exception as details:
+ print("INFO: expand_pkg_grps failed ", details)
def is_quad_core():
'''
@@ -596,8 +596,8 @@ def is_quad_core():
return(1)
else:
return(0)
- except IOError, e:
- print "Failed to get cpu core information", e
+ except IOError as e:
+ print("Failed to get cpu core information", e)
sys.exit(1)
def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
@@ -628,7 +628,7 @@ def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
# in different cores of same package
#if sched_smt_level > 0 :
#return 1
- else:
+ else:
for pkg in sorted(cpu_map.keys()):
pkg_cpus = cpu_map[pkg]
if len(cpu_group) == len(pkg_cpus):
@@ -640,8 +640,8 @@ def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
return(1)
- except Exception, details:
- print "Exception in validate_cpugrp_map: ", details
+ except Exception as details:
+ print("Exception in validate_cpugrp_map: ", details)
sys.exit(1)
@@ -680,8 +680,8 @@ def verify_sched_domain_dmesg(sched_mc_level, sched_smt_level):
return(0)
else:
return(1)
- except Exception, details:
- print "Reading dmesg failed", details
+ except Exception as details:
+ print("Reading dmesg failed", details)
sys.exit(1)
def get_cpu_utilization(cpu):
@@ -692,8 +692,8 @@ def get_cpu_utilization(cpu):
if cpu == stats_percentage[l][0]:
return stats_percentage[l][1]
return -1
- except Exception, details:
- print "Exception in get_cpu_utilization", details
+ except Exception as details:
+ print("Exception in get_cpu_utilization", details)
sys.exit(1)
def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level):
@@ -737,7 +737,7 @@ def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level)
if stats_percentage[l][1] > 70:
cpus_utilized.append(int(cpu_id[1]))
cpus_utilized.sort()
- print "INFO: CPU's utilized ", cpus_utilized
+ print("INFO: CPU's utilized ", cpus_utilized)
# If length of CPU's utilized is not = number of jobs exit with 1
if len(cpus_utilized) < threads:
@@ -746,11 +746,11 @@ def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level)
status = validate_cpugrp_map(cpus_utilized, sched_mc_level, \
sched_smt_level)
if status == 1:
- print "INFO: CPUs utilized is not in same package or core"
+ print("INFO: CPUs utilized is not in same package or core")
return(status)
- except Exception, details:
- print "Exception in validate_cpu_consolidation: ", details
+ except Exception as details:
+ print("Exception in validate_cpu_consolidation: ", details)
sys.exit(1)
def get_cpuid_max_intr_count():
@@ -780,13 +780,13 @@ def get_cpuid_max_intr_count():
diff = second_highest - intr_stop[i]
''' Threshold of difference has to be manipulated '''
if diff < 10000:
- print "INFO: Diff in interrupt count is below threshold"
+ print("INFO: Diff in interrupt count is below threshold")
cpus_utilized = []
return cpus_utilized
- print "INFO: Interrupt count in other CPU's low as expected"
+ print("INFO: Interrupt count in other CPU's low as expected")
return cpus_utilized
- except Exception, details:
- print "Exception in get_cpuid_max_intr_count: ", details
+ except Exception as details:
+ print("Exception in get_cpuid_max_intr_count: ", details)
sys.exit(1)
def validate_ilb (sched_mc_level, sched_smt_level):
@@ -799,8 +799,8 @@ def validate_ilb (sched_mc_level, sched_smt_level):
status = validate_cpugrp_map(cpus_utilized, sched_mc_level, sched_smt_level)
return status
- except Exception, details:
- print "Exception in validate_ilb: ", details
+ except Exception as details:
+ print("Exception in validate_ilb: ", details)
sys.exit(1)
def reset_schedmc():
@@ -809,8 +809,8 @@ def reset_schedmc():
try:
os.system('echo 0 > \
/sys/devices/system/cpu/sched_mc_power_savings 2>/dev/null')
- except OSError, e:
- print "Could not set sched_mc_power_savings to 0", e
+ except OSError as e:
+ print("Could not set sched_mc_power_savings to 0", e)
sys.exit(1)
def reset_schedsmt():
@@ -819,8 +819,8 @@ def reset_schedsmt():
try:
os.system('echo 0 > \
/sys/devices/system/cpu/sched_smt_power_savings 2>/dev/null')
- except OSError, e:
- print "Could not set sched_smt_power_savings to 0", e
+ except OSError as e:
+ print("Could not set sched_smt_power_savings to 0", e)
sys.exit(1)
def stop_wkld(work_ld):
@@ -830,6 +830,6 @@ def stop_wkld(work_ld):
os.system('pkill %s 2>/dev/null' %work_ld)
if work_ld == "kernbench":
os.system('pkill make 2>/dev/null')
- except OSError, e:
- print "Exception in stop_wkld", e
+ except OSError as e:
+ print("Exception in stop_wkld", e)
sys.exit(1)
diff --git a/testcases/kernel/power_management/pm_cpu_consolidation.py b/testcases/kernel/power_management/pm_cpu_consolidation.py
index 734db2759..fbe262aad 100755
--- a/testcases/kernel/power_management/pm_cpu_consolidation.py
+++ b/testcases/kernel/power_management/pm_cpu_consolidation.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
''' This Python script interprets various sched stats values.
Validates cpu consolidation for given sched_mc_power_saving value
'''
@@ -79,7 +79,7 @@ def main(argv=None):
generate_report()
status = validate_cpu_consolidation("partial", work_ld, options.mc_value, options.smt_value)
if status == 0:
- print "INFO: Consolidation worked sched_smt &(/) sched_mc is set"
+ print("INFO: Consolidation worked sched_smt &(/) sched_mc is set")
#Disable sched_smt & sched_mc interface values
if options.vary_mc_smt and options.mc_value > 0:
set_sched_mc_power(0)
@@ -107,8 +107,8 @@ def main(argv=None):
else:
return(1)
else:
- print "INFO: CPU consolidation failed when sched_mc &(/) \
-sched_smt was enabled. This is pre-requisite to proceed"
+ print("INFO: CPU consolidation failed when sched_mc &(/) \
+sched_smt was enabled. This is pre-requisite to proceed")
return(status)
else:
#The else part of the code validates behaviour of sched_mc
@@ -118,7 +118,7 @@ sched_smt was enabled. This is pre-requisite to proceed"
if is_hyper_threaded():
set_sched_smt_power(options.smt_value)
map_cpuid_pkgid()
- print "INFO: Created table mapping cpu to package"
+ print("INFO: Created table mapping cpu to package")
background="no"
duration=60
pinned ="no"
@@ -135,8 +135,8 @@ sched_smt was enabled. This is pre-requisite to proceed"
if is_hyper_threaded():
reset_schedsmt()
return(status)
- except Exception, details:
- print "INFO: CPU consolidation failed", details
+ except Exception as details:
+ print(("INFO: CPU consolidation failed", details))
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_ilb_test.py b/testcases/kernel/power_management/pm_ilb_test.py
index 0b447d804..412ceb9f7 100755
--- a/testcases/kernel/power_management/pm_ilb_test.py
+++ b/testcases/kernel/power_management/pm_ilb_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
''' This Python script interprets interrupt values.
Validates Ideal load balancer runs in same package where workload is running
'''
@@ -36,7 +36,7 @@ def main(argv=None):
if is_hyper_threaded():
set_sched_smt_power(options.smt_level)
map_cpuid_pkgid()
- print "INFO: Created table mapping cpu to package"
+ print("INFO: Created table mapping cpu to package")
background="no"
duration=120
pinned="yes"
@@ -49,8 +49,8 @@ def main(argv=None):
reset_schedsmt()
return(status)
- except Exception, details:
- print "INFO: Idle Load Balancer test failed", details
+ except Exception as details:
+ print(("INFO: Idle Load Balancer test failed", details))
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_sched_domain.py b/testcases/kernel/power_management/pm_sched_domain.py
index a54b0e9be..0ada3eea4 100755
--- a/testcases/kernel/power_management/pm_sched_domain.py
+++ b/testcases/kernel/power_management/pm_sched_domain.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
''' This Python script validates sched domain information in dmesg
with information in sysfs topology
'''
@@ -43,10 +43,10 @@ def main(argv=None):
reset_schedsmt()
return(status)
else:
- print "INFO: Invalid arguments given"
+ print("INFO: Invalid arguments given")
return 1
- except Exception, details:
- print "INFO: sched domain test failed: ", details
+ except Exception as details:
+ print(("INFO: sched domain test failed: ", details))
return(1)
# Run test based on the command line arguments
diff --git a/testcases/network/nfsv4/acl/cleangroups.py b/testcases/network/nfsv4/acl/cleangroups.py
index 341746e83..11f8045b5 100755
--- a/testcases/network/nfsv4/acl/cleangroups.py
+++ b/testcases/network/nfsv4/acl/cleangroups.py
@@ -1,6 +1,7 @@
+#!/usr/bin/python3
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/cleanusers.py b/testcases/network/nfsv4/acl/cleanusers.py
index 7ac435087..f2597d27e 100755
--- a/testcases/network/nfsv4/acl/cleanusers.py
+++ b/testcases/network/nfsv4/acl/cleanusers.py
@@ -1,6 +1,7 @@
+#!/usr/bin/python3
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/create_users.py b/testcases/network/nfsv4/acl/create_users.py
index 568cb9a42..0dcaecbe9 100755
--- a/testcases/network/nfsv4/acl/create_users.py
+++ b/testcases/network/nfsv4/acl/create_users.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
'''
Access Control Lists testing based on newpynfs framework
Aurelien Charbon - Bull SA
diff --git a/testcases/network/nfsv4/acl/random_gen.py b/testcases/network/nfsv4/acl/random_gen.py
index d39dbb3db..1f05534b7 100755
--- a/testcases/network/nfsv4/acl/random_gen.py
+++ b/testcases/network/nfsv4/acl/random_gen.py
@@ -1,4 +1,5 @@
-import commands
+#!/usr/bin/python3
+import subprocess
import random
import re
@@ -30,20 +31,20 @@ class RandomGen(object):
def createUser(self,username):
group = self.gList[random.randint(0,len(self.gList)-1)][0]
opts = "-g" + group + " -p" + "1pilot" + " -m " + username
- u = commands.getoutput('/usr/sbin/useradd '+ opts)
+ u = subprocess.getoutput('/usr/sbin/useradd '+ opts)
if u != "":
- print "create user " + username + "failed" + u
+ print(("create user " + username + "failed" + u))
def createFile(self,path,n):
for i in range(n):
fName = 'file' + str(i)
- u = commands.getoutput('touch ' + path + '/'+ fName)
+ u = subprocess.getoutput('touch ' + path + '/'+ fName)
self.fList.append(fName)
def createGroup(self, grpname, gid):
- u = commands.getoutput('/usr/sbin/groupadd -g' + gid + " " + grpname)
+ u = subprocess.getoutput('/usr/sbin/groupadd -g' + gid + " " + grpname)
if u != "":
- print u
+ print(u)
def createNGroup(self, n):
for i in range(n):
@@ -61,13 +62,13 @@ class RandomGen(object):
""" clean all users created to do the tests """
def cleanUsers(self):
for name in self.uList:
- u = commands.getoutput('/usr/sbin/userdel -r '+ name)
+ u = subprocess.getoutput('/usr/sbin/userdel -r '+ name)
self.uList = []
""" clean all users created to do the tests """
def cleanGroups(self):
for name in self.gList:
- u = commands.getoutput('/usr/sbin/groupdel '+ name[0])
+ u = subprocess.getoutput('/usr/sbin/groupdel '+ name[0])
self.gList = []
""" Retrieve the list of user from /etc/passwd file """
@@ -86,7 +87,7 @@ class RandomGen(object):
f.close()
def getFileList(self,path):
- u = commands.getoutput('ls ' + path)
+ u = subprocess.getoutput('ls ' + path)
tmp = u.split('\n')
for i in range (len(tmp)-1):
NameOK = re.match("file",tmp[i])
@@ -142,10 +143,10 @@ class RandomGen(object):
f.close()
def printUserList(self):
- print self.uList
+ print((self.uList))
def printGroupList(self):
- print self.gList
+ print((self.gList))
""" Create a random name of random length """
def createOneNameRandomLength(self,maxlength):
@@ -211,19 +212,19 @@ class RandomGen(object):
file = self.fList[random.randint(0,len(self.fList)-1)]
if a == 1: # creation/modification
user = self.uList[random.randint(0,len(self.uList)-1)]
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + file)
if a == 2: # with group
group = self.gList[random.randint(0,len(self.gList)-1)][0]
- u = commands.getoutput('setfacl -m g:' + group + ':' + mode + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -m g:' + group + ':' + mode + " " + path + "/" + file)
if a == 3: # deletation
user = self.uList[random.randint(0,len(self.uList)-1)]
- u = commands.getoutput('setfacl -x u:' + user + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -x u:' + user + " " + path + "/" + file)
if a == 4: # with group
group = self.gList[random.randint(0,len(self.gList)-1)][0]
- u = commands.getoutput('setfacl -x g:' + group + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -x g:' + group + " " + path + "/" + file)
# request on a unexisting group
'''if a == 5:
diff --git a/testcases/network/nfsv4/acl/setacl_stress.py b/testcases/network/nfsv4/acl/setacl_stress.py
index 3713ff6a9..68a493274 100755
--- a/testcases/network/nfsv4/acl/setacl_stress.py
+++ b/testcases/network/nfsv4/acl/setacl_stress.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
'''
Access Control Lists stressing script
To lauch on the first client
@@ -6,7 +7,7 @@
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/test_acl.py b/testcases/network/nfsv4/acl/test_acl.py
index d29c0e3f1..b4144555f 100755
--- a/testcases/network/nfsv4/acl/test_acl.py
+++ b/testcases/network/nfsv4/acl/test_acl.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
'''
Access Control Lists testing based on newpynfs framework
Aurelien Charbon - Bull SA
diff --git a/testcases/network/nfsv4/acl/test_long_acl.py b/testcases/network/nfsv4/acl/test_long_acl.py
index a7c8cb1a1..b0326d4e5 100755
--- a/testcases/network/nfsv4/acl/test_long_acl.py
+++ b/testcases/network/nfsv4/acl/test_long_acl.py
@@ -1,10 +1,11 @@
+#!/usr/bin/python3
'''
Access Control Lists testing based on newpynfs framework
Aurelien Charbon - Bull SA
'''
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import threading
import time
@@ -19,20 +20,20 @@ def test_longacl(l,path):
# mesures sur le getfacl
test = RandomGen()
- u = commands.getoutput('rm ' + path + "/*") # clean directory
- print "test acl getfacl\n"
+ u = subprocess.getoutput('rm ' + path + "/*") # clean directory
+ print("test acl getfacl\n")
for i in range(l):
test.getUserList()
testfile = 'testfile' + str(i)
- u = commands.getoutput('touch ' + path + "/" + testfile)
- print "setfacl with " + str(i) + " entries\n " + u
+ u = subprocess.getoutput('touch ' + path + "/" + testfile)
+ print(("setfacl with " + str(i) + " entries\n " + u))
for j in range(i):
user = test.uList.pop()
mode = test.createRandomMode()
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
if u != "":
- print "setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile
- print u
+ print(("setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile))
+ print(u)
def main():
parser = OptionParser()
parser.add_option("-l", "--length", dest="length",type="int",help="max lentgh of ACL")
diff --git a/testcases/network/nfsv4/locks/locktests.py b/testcases/network/nfsv4/locks/locktests.py
index dd518ab6e..bb968232f 100755
--- a/testcases/network/nfsv4/locks/locktests.py
+++ b/testcases/network/nfsv4/locks/locktests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# This script aims to help to run locktests with several clients.
#
# Report bugs to Vincent ROQUETA : vincent.roqueta@ext.bull.net
@@ -38,8 +38,8 @@ class Machine:
self.do()
def printc(self):
- print "->"+self.command
- print "\n"
+ print(("->"+self.command))
+ print("\n")
class Client(Machine):
@@ -95,25 +95,25 @@ class Serveur(Machine):
self.unexport(unexportDir)
self.rmdir(unexportDir)
def usage():
- print "\n"
- print "usage:"
- print "locktests.py <-n process -f testfile ><--setup -s fs_server> -c host1, host2, host3 ... "
- print "--setup : setup the configuration, deploy test on other test machines; This option also requires -c and -s"
- print "-c <machine> : host list to deploy/run/clean the test"
- print "-s <machine> : NFS server to use to setup the test"
- print "-n <num> : number of processes each test machine will lauch to perform the test"
- print "-f <file> : test file. This must be the same on each machine"
- print " "
- print "Example :"
- print "========="
- print "*Setup machines for testing"
- print "./locktests.py --setup -c testmachine1 testmachine2 testmachine3 -s my_nfs_server:/"
- print "\n"
- print "*Run test on testmachine1,testmachine2 with 50 process on each machine using /mnt/nfsv4/testfile"
- print "./locktests.py -n 50 -f /mnt/nfsv4/testfile -c testmachine1 testmachine2"
- print "\n"
- print "_________________________________"
- print "Vincent ROQUETA - Bull SA - 2005\n"
+ print("\n")
+ print("usage:")
+ print("locktests.py <-n process -f testfile ><--setup -s fs_server> -c host1, host2, host3 ... ")
+ print("--setup : setup the configuration, deploy test on other test machines; This option also requires -c and -s")
+ print("-c <machine> : host list to deploy/run/clean the test")
+ print("-s <machine> : NFS server to use to setup the test")
+ print("-n <num> : number of processes each test machine will lauch to perform the test")
+ print("-f <file> : test file. This must be the same on each machine")
+ print(" ")
+ print("Example :")
+ print("=========")
+ print("*Setup machines for testing")
+ print("./locktests.py --setup -c testmachine1 testmachine2 testmachine3 -s my_nfs_server:/")
+ print("\n")
+ print("*Run test on testmachine1,testmachine2 with 50 process on each machine using /mnt/nfsv4/testfile")
+ print("./locktests.py -n 50 -f /mnt/nfsv4/testfile -c testmachine1 testmachine2")
+ print("\n")
+ print("_________________________________")
+ print("Vincent ROQUETA - Bull SA - 2005\n")
return 0
@@ -124,14 +124,14 @@ def setup():
fichier=SRC_PATH+"/"+SRC
commande=""
for i in clients:
- print "Setting up machine "+i
+ print(("Setting up machine "+i))
c=Client(i)
c.mkdir(path)
c.cp(fichier, path)
c.install(path)
c.isomount(NFS4_PATH)
#Setup localhost
- print "Setting up localhost"
+ print("Setting up localhost")
commande="make; mkdir -p "+NFS4_PATH+" ; mount -t nfs4 "+NFS4_SERVER+" "+NFS4_PATH+" &"
os.system(commande)
@@ -159,7 +159,7 @@ def clean():
args=sys.argv[1:]
-rge=range(len(args))
+rge=list(range(len(args)))
a=""
r=True
s=False
@@ -213,17 +213,17 @@ if s:
if (not c) or (not nfsServer):
usage()
sys.exit(1)
- print "Setup"
- print NFS4_SERVER
+ print("Setup")
+ print(NFS4_SERVER)
setup()
- print "Setup complete"
+ print("Setup complete")
if r:
if (not c) or (not f) or (not n):
usage()
sys.exit(1)
- print "Running test"
+ print("Running test")
run()
diff --git a/testcases/realtime/func/pi-tests/parse-testpi1.py b/testcases/realtime/func/pi-tests/parse-testpi1.py
index df5ee6815..e95149190 100644
--- a/testcases/realtime/func/pi-tests/parse-testpi1.py
+++ b/testcases/realtime/func/pi-tests/parse-testpi1.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
################################################################################
diff --git a/testcases/realtime/func/pi-tests/parse-testpi2.py b/testcases/realtime/func/pi-tests/parse-testpi2.py
index 02db68c02..5f6e63d97 100644
--- a/testcases/realtime/func/pi-tests/parse-testpi2.py
+++ b/testcases/realtime/func/pi-tests/parse-testpi2.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
################################################################################
diff --git a/testcases/realtime/scripts/parser.py b/testcases/realtime/scripts/parser.py
index 6b2dc7370..03d2a3ea0 100644
--- a/testcases/realtime/scripts/parser.py
+++ b/testcases/realtime/scripts/parser.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
################################################################################
@@ -34,7 +35,7 @@ class Log:
log_file=filename
try:
self.__log_file = open(log_file, "r")
- except IOError, errmsg:
+ except IOError as errmsg:
sys.exit(errmsg)
def read(self):
diff --git a/testcases/realtime/tools/ftqviz.py b/testcases/realtime/tools/ftqviz.py
index 19ae093a0..1cd07b408 100644
--- a/testcases/realtime/tools/ftqviz.py
+++ b/testcases/realtime/tools/ftqviz.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# Filename: ftqviz.py
# Author: Darren Hart <dvhltc@us.ibm.com>
@@ -37,7 +37,7 @@ NS_PER_US = 1000
def smooth(x, wlen):
if x.size < wlen:
- raise ValueError, "Input vector needs to be bigger than window size."
+ raise ValueError("Input vector needs to be bigger than window size.")
# reflect the signal to avoid transients... ?
s = r_[2*x[0]-x[wlen:1:-1], x, 2*x[-1]-x[-1:-wlen:-1]]
@@ -62,8 +62,8 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# same factor
ns_per_sample = NS_PER_S / sample_hz
- print "Interpolated Sample Rate: ", sample_hz, " HZ"
- print "Hamming Window Length: ", wlen
+ print(("Interpolated Sample Rate: ", sample_hz, " HZ"))
+ print(("Hamming Window Length: ", wlen))
t = fromfile(timefile, dtype=int64, sep='\n')
x = fromfile(countfile, dtype=int64, sep='\n')
@@ -83,7 +83,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# smooth the signal (low pass filter)
try:
y = smooth(xi, wlen)
- except ValueError, e:
+ except ValueError as e:
exit(e)
# generate the fft
@@ -121,7 +121,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
def usage():
- print "usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]"
+ print(("usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]"))
if __name__=='__main__':
@@ -143,7 +143,7 @@ if __name__=='__main__':
usage()
exit()
if o == "-s":
- sample_hz = long(a)
+ sample_hz = int@
if o == "-t":
times_file = a
if o == "-w":
diff --git a/testscripts/build/ltp-missing-install-files.py b/testscripts/build/ltp-missing-install-files.py
index 1ab40a09f..11465a725 100755
--- a/testscripts/build/ltp-missing-install-files.py
+++ b/testscripts/build/ltp-missing-install-files.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#
# Script for determining items missing from LTP install based on the output
# log provided by runltp[lite.sh].
@@ -111,6 +111,6 @@ for logfile in logfiles:
fd.close()
if len(missing_ents):
- print "\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents])
+ print(("\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents])))
elif opts.verbose:
- print "%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile)
+ print(("%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile)))
diff --git a/tools/pounder21/src/time_tests/drift-test.py b/tools/pounder21/src/time_tests/drift-test.py
index aba1909e3..0c2575659 100755
--- a/tools/pounder21/src/time_tests/drift-test.py
+++ b/tools/pounder21/src/time_tests/drift-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# Time Drift Script
# Periodically checks and displays time drift
@@ -24,7 +24,7 @@
# Usage: drift-test.py [-s] [ntp_server [sleep_time]]
-import commands
+import subprocess
import sys
import string
import time
@@ -52,9 +52,9 @@ if sleep_time == 0:
#set time
if (set_time == 1):
- cmd = commands.getoutput('/usr/sbin/ntpdate -ub ' + server)
+ cmd = subprocess.getoutput('/usr/sbin/ntpdate -ub ' + server)
-cmd = commands.getoutput('/usr/sbin/ntpdate -uq ' + server)
+cmd = subprocess.getoutput('/usr/sbin/ntpdate -uq ' + server)
line = string.split(cmd)
#parse original offset
@@ -65,7 +65,7 @@ datestr = time.strftime("%d %b %Y %H:%M:%S", start_time)
time.sleep(1)
while 1:
- cmd = commands.getoutput('/usr/sbin/ntpdate -uq ' + server)
+ cmd = subprocess.getoutput('/usr/sbin/ntpdate -uq ' + server)
line = string.split(cmd)
#parse offset
@@ -81,9 +81,9 @@ while 1:
drift = delta_offset / delta_time * 1000000
#print output
- print time.strftime("%d %b %H:%M:%S",now_time),
- print " offset:", now_offset ,
- print " drift:", drift ,"ppm"
+ print(time.strftime("%d %b %H:%M:%S",now_time), end=' ')
+ print(" offset:", now_offset, end=' ')
+ print(" drift:", drift ,"ppm")
sys.stdout.flush()
#sleep
--
2.13.6
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH v2] *.py : convert python2 to python3
2018-04-23 3:32 ` [LTP] [PATCH v2] " Yong Sun
@ 2018-04-23 6:55 ` Petr Vorel
0 siblings, 0 replies; 12+ messages in thread
From: Petr Vorel @ 2018-04-23 6:55 UTC (permalink / raw)
To: ltp
Hi Yosun,
> From: yosun <yosun@suse.com>
> 1.Convert python code to use python3
> 2.Make shebang same as standard python shebang
> Signed-off-by: Yong Sun <yosun@suse.com>
> ---
> execltp.in | 12 +-
> testcases/commands/file/datafiles/in.py | 2 +-
> .../kernel/power_management/lib/pm_sched_mc.py | 218 ++++++++++-----------
> .../power_management/pm_cpu_consolidation.py | 14 +-
> testcases/kernel/power_management/pm_ilb_test.py | 8 +-
> .../kernel/power_management/pm_sched_domain.py | 8 +-
> testcases/network/nfsv4/acl/cleangroups.py | 3 +-
> testcases/network/nfsv4/acl/cleanusers.py | 3 +-
> testcases/network/nfsv4/acl/create_users.py | 1 +
> testcases/network/nfsv4/acl/random_gen.py | 31 +--
> testcases/network/nfsv4/acl/setacl_stress.py | 3 +-
> testcases/network/nfsv4/acl/test_acl.py | 1 +
> testcases/network/nfsv4/acl/test_long_acl.py | 17 +-
> testcases/network/nfsv4/locks/locktests.py | 58 +++---
> testcases/realtime/func/pi-tests/parse-testpi1.py | 1 +
> testcases/realtime/func/pi-tests/parse-testpi2.py | 1 +
> testcases/realtime/scripts/parser.py | 3 +-
> testcases/realtime/tools/ftqviz.py | 14 +-
> testscripts/build/ltp-missing-install-files.py | 6 +-
> tools/pounder21/src/time_tests/drift-test.py | 16 +-
> 20 files changed, 215 insertions(+), 205 deletions(-)
there are still some errors (not caused by you), which were ok for python2 but must be
fixed for python3. Can you please fix them?
$ python3 -m py_compile testcases/network/nfsv4/acl/random_gen.py
Sorry: TabError: inconsistent use of tabs and spaces in indentation (random_gen.py, line 201)
testcases/network/nfsv4/acl/random_gen.py: 1
$ python3 -m py_compile testcases/network/nfsv4/acl/test_acl.py
File "testcases/network/nfsv4/acl/test_acl.py", line 22
for i in range (len(splitedresult)-1)
^
SyntaxError: invalid syntax
testcases/network/nfsv4/acl/test_acl.py: 1
$ python3 -m py_compile testcases/network/nfsv4/acl/test_long_acl.py
Sorry: TabError: inconsistent use of tabs and spaces in indentation (test_long_acl.py, line 33)
testcases/network/nfsv4/acl/test_long_acl.py: 1
$ python3 -m py_compile testcases/network/nfsv4/locks/locktests.py
Sorry: TabError: inconsistent use of tabs and spaces in indentation (locktests.py, line 106)
testcases/network/nfsv4/locks/locktests.py: 1
$ python3 -m py_compile testcases/realtime/func/pi-tests/parse-testpi1.py
Sorry: TabError: inconsistent use of tabs and spaces in indentation (parse-testpi1.py, line 44)
testcases/realtime/func/pi-tests/parse-testpi1.py: 1
$ python3 -m py_compile testcases/realtime/func/pi-tests/parse-testpi2.py
Sorry: TabError: inconsistent use of tabs and spaces in indentation (parse-testpi2.py, line 47)
testcases/realtime/func/pi-tests/parse-testpi2.py: 1
$ python3 -m py_compile testcases/realtime/scripts/parser.py
Sorry: TabError: inconsistent use of tabs and spaces in indentation (parser.py, line 34)
testcases/realtime/scripts/parser.py: 1
Kind regards,
Petr
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH v3] *.py : convert python2 to python3
2018-04-19 10:10 [LTP] [PATCH] *.py : convert python2 to python3 Yong Sun
` (3 preceding siblings ...)
2018-04-23 3:32 ` [LTP] [PATCH v2] " Yong Sun
@ 2018-04-23 8:12 ` Yong Sun
2018-04-24 9:05 ` Petr Vorel
4 siblings, 1 reply; 12+ messages in thread
From: Yong Sun @ 2018-04-23 8:12 UTC (permalink / raw)
To: ltp
From: yosun <yosun@suse.com>
1. Convert python code to use python3
2. Make shebang same as standard python shebang
3. Correct format to solve compiling error in python3
Signed-off-by: Yong Sun <yosun@suse.com>
---
execltp.in | 12 +-
testcases/commands/file/datafiles/in.py | 2 +-
.../kernel/power_management/lib/pm_sched_mc.py | 218 ++++++++++-----------
.../power_management/pm_cpu_consolidation.py | 14 +-
testcases/kernel/power_management/pm_ilb_test.py | 8 +-
.../kernel/power_management/pm_sched_domain.py | 8 +-
testcases/network/nfsv4/acl/cleangroups.py | 3 +-
testcases/network/nfsv4/acl/cleanusers.py | 3 +-
testcases/network/nfsv4/acl/create_users.py | 1 +
testcases/network/nfsv4/acl/random_gen.py | 43 ++--
testcases/network/nfsv4/acl/setacl_stress.py | 3 +-
testcases/network/nfsv4/acl/test_acl.py | 60 +++---
testcases/network/nfsv4/acl/test_long_acl.py | 19 +-
testcases/network/nfsv4/locks/locktests.py | 62 +++---
testcases/realtime/func/pi-tests/parse-testpi1.py | 16 +-
testcases/realtime/func/pi-tests/parse-testpi2.py | 15 +-
testcases/realtime/scripts/parser.py | 23 +--
testcases/realtime/tools/ftqviz.py | 14 +-
testscripts/build/ltp-missing-install-files.py | 6 +-
tools/pounder21/src/time_tests/drift-test.py | 16 +-
20 files changed, 276 insertions(+), 270 deletions(-)
diff --git a/execltp.in b/execltp.in
index 10b1f53f3..57e9c45a5 100755
--- a/execltp.in
+++ b/execltp.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
"""
An LTP [execution and] parsing wrapper.
@@ -146,7 +146,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
while True:
- line = line_iterator.next()
+ line = next(line_iterator)
if line.startswith(end_output):
@@ -161,7 +161,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
while True:
- line = line_iterator.next()
+ line = next(line_iterator)
match = tag_re.match(line)
@@ -177,7 +177,7 @@ def parse_ltp_results(exec_log, output_log, verbose=0):
except StopIteration:
pass
- for k in context.keys():
+ for k in list(context.keys()):
if k not in search_tags:
raise ResultsParseException('Leftover token in search '
'keys: %s' % k)
@@ -219,7 +219,7 @@ def print_context(output_dest, header, testsuite_context):
output_dest.write('\n'.join(['', '=' * 40, header, '-' * 40, '']))
- for test, context in testsuite_context.items():
+ for test, context in list(testsuite_context.items()):
output_dest.write('<output test="%s">\n%s\n</output>\n' %
(test, context.strip()))
@@ -302,7 +302,7 @@ def main():
if not opts.summary_mode and not opts.verbose:
parser.error('You cannot suppress summary output and disable '
'verbosity.')
- elif opts.summary_mode not in range(3):
+ elif opts.summary_mode not in list(range(3)):
parser.error('--summary-mode must be a value between 0 and 2.')
if len(args) == 0:
diff --git a/testcases/commands/file/datafiles/in.py b/testcases/commands/file/datafiles/in.py
index 26f54ffd2..802e7bf98 100755
--- a/testcases/commands/file/datafiles/in.py
+++ b/testcases/commands/file/datafiles/in.py
@@ -1,3 +1,3 @@
-#!/usr/bin/python
+#!/usr/bin/python3
print("This is a test.")
diff --git a/testcases/kernel/power_management/lib/pm_sched_mc.py b/testcases/kernel/power_management/lib/pm_sched_mc.py
index feb4b24d3..3574330a1 100755
--- a/testcases/kernel/power_management/lib/pm_sched_mc.py
+++ b/testcases/kernel/power_management/lib/pm_sched_mc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
''' Reusable functions related to sched mc FVT are put together
'''
@@ -30,8 +30,8 @@ def clear_dmesg():
'''
try:
os.system('dmesg -c >/dev/null')
- except OSError, e:
- print 'Clearing dmesg failed', e
+ except OSError as e:
+ print('Clearing dmesg failed', e)
sys.exit(1)
def count_num_cpu():
@@ -44,8 +44,8 @@ def count_num_cpu():
if line.startswith('processor'):
cpu_count += 1
cpuinfo.close()
- except IOError, e:
- print "Could not get cpu count", e
+ except IOError as e:
+ print("Could not get cpu count", e)
sys.exit(1)
def count_num_sockets():
@@ -61,8 +61,8 @@ def count_num_sockets():
if socket_id not in socket_list:
socket_list.append(socket_id)
socket_count = socket_count + 1
- except Exception, details:
- print "INFO: Failed to get number of sockets in system", details
+ except Exception as details:
+ print("INFO: Failed to get number of sockets in system", details)
sys.exit(1)
def is_multi_socket():
@@ -74,7 +74,7 @@ def is_multi_socket():
else:
return 0
except Exception:
- print "Failed to check if system is multi socket system"
+ print("Failed to check if system is multi socket system")
sys.exit(1)
def is_hyper_threaded():
@@ -94,7 +94,7 @@ def is_hyper_threaded():
else:
return 0
except Exception:
- print "Failed to check if system is hyper-threaded"
+ print("Failed to check if system is hyper-threaded")
sys.exit(1)
def is_multi_core():
@@ -124,7 +124,7 @@ def is_multi_core():
file_cpuinfo.close()
return multi_core
except Exception:
- print "Failed to check if system is multi core system"
+ print("Failed to check if system is multi core system")
sys.exit(1)
def get_hyper_thread_count():
@@ -142,7 +142,7 @@ def get_hyper_thread_count():
break
return( int( siblings[1] ) / int( cpu_cores[1] ) )
except Exception:
- print "Failed to check if system is hyper-threaded"
+ print("Failed to check if system is hyper-threaded")
sys.exit(1)
def map_cpuid_pkgid():
@@ -158,17 +158,17 @@ def map_cpuid_pkgid():
core_file += '/topology/core_id'
core_id = open(core_file).read().rstrip()
cpu_phy_id = open(phy_pkg_file).read().rstrip()
- if not cpu_phy_id in cpu_map.keys():
+ if not cpu_phy_id in list(cpu_map.keys()):
core_info = {}
else:
core_info = cpu_map[cpu_phy_id]
- if not core_id in core_info.keys():
+ if not core_id in list(core_info.keys()):
core_info[core_id] = [i]
else:
core_info[core_id].append(i)
cpu_map[cpu_phy_id] = core_info
- except Exception, details:
- print "Package, core & cpu map table creation failed", e
+ except Exception as details:
+ print("Package, core & cpu map table creation failed", e)
sys.exit(1)
else:
for i in range(0, cpu_count):
@@ -176,12 +176,12 @@ def map_cpuid_pkgid():
phy_pkg_file = '/sys/devices/system/cpu/cpu%s' %i
phy_pkg_file += '/topology/physical_package_id'
cpu_phy_id = open(phy_pkg_file).read().rstrip()
- if not cpu_phy_id in cpu_map.keys():
+ if not cpu_phy_id in list(cpu_map.keys()):
cpu_map[cpu_phy_id] = [i]
else:
cpu_map[cpu_phy_id].append(i)
- except IOError, e:
- print "Mapping of CPU to pkg id failed", e
+ except IOError as e:
+ print("Mapping of CPU to pkg id failed", e)
sys.exit(1)
@@ -197,8 +197,8 @@ def generate_sibling_list():
if not thread_ids in siblings_list:
siblings_list.append(thread_ids)
- except Exception, details:
- print "Exception in generate_siblings_list", details
+ except Exception as details:
+ print("Exception in generate_siblings_list", details)
sys.exit(1)
def get_siblings(cpu_id):
@@ -215,8 +215,8 @@ def get_siblings(cpu_id):
cpus += j
return cpus
return cpus
- except Exception, details:
- print "Exception in get_siblings", details
+ except Exception as details:
+ print("Exception in get_siblings", details)
sys.exit(1)
def get_proc_data(stats_list):
@@ -229,8 +229,8 @@ def get_proc_data(stats_list):
data = line.split()
stats_list[data[0]] = data
file_procstat.close()
- except OSError, e:
- print "Could not read statistics", e
+ except OSError as e:
+ print("Could not read statistics", e)
sys.exit(1)
def get_proc_loc_count(loc_stats):
@@ -246,8 +246,8 @@ def get_proc_loc_count(loc_stats):
loc_stats.append(data[i+1])
file_procstat.close()
return
- except Exception, details:
- print "Could not read interrupt statistics", details
+ except Exception as details:
+ print("Could not read interrupt statistics", details)
sys.exit(1)
@@ -260,9 +260,9 @@ def set_sched_mc_power(sched_mc_level):
% sched_mc_level)
get_proc_data(stats_start)
- except OSError, e:
- print "Could not set sched_mc_power_savings to", sched_mc_level, e
- sys.exit(1)
+ except OSError as e:
+ print("Could not set sched_mc_power_savings to", sched_mc_level, e)
+ sys.exit(1)
def set_sched_smt_power(sched_smt_level):
''' Routine to set sched_smt_power_savings to required level
@@ -273,9 +273,9 @@ def set_sched_smt_power(sched_smt_level):
% sched_smt_level)
get_proc_data(stats_start)
- except OSError, e:
- print "Could not set sched_smt_power_savings to", sched_smt_level, e
- sys.exit(1)
+ except OSError as e:
+ print("Could not set sched_smt_power_savings to", sched_smt_level, e)
+ sys.exit(1)
def set_timer_migration_interface(value):
''' Set value of timer migration interface to a value
@@ -284,8 +284,8 @@ def set_timer_migration_interface(value):
try:
os.system('echo %s > \
/proc/sys/kernel/timer_migration 2>/dev/null' % value)
- except OSError, e:
- print "Could not set timer_migration to ", value, e
+ except OSError as e:
+ print("Could not set timer_migration to ", value, e)
sys.exit(1)
def get_job_count(stress, workload, sched_smt):
@@ -308,8 +308,8 @@ def get_job_count(stress, workload, sched_smt):
threads = 1
duration = 180
return threads
- except Exception, details:
- print "get job count failed ", details
+ except Exception as details:
+ print("get job count failed ", details)
sys.exit(1)
def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
@@ -328,7 +328,7 @@ def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
workload_file = file_name
break
if workload_file == "":
- print "INFO: ebizzy benchmark not found"
+ print("INFO: ebizzy benchmark not found")
os.chdir(olddir)
sys.exit(1)
get_proc_data(stats_start)
@@ -346,21 +346,21 @@ def trigger_ebizzy (sched_smt, stress, duration, background, pinned):
% (threads, duration))
if succ == 0:
- print "INFO: ebizzy workload triggerd"
+ print("INFO: ebizzy workload triggerd")
os.chdir(olddir)
#Commented bcoz it doesnt make sense to capture it when workload triggered
#in background
#get_proc_loc_count(intr_stop)
#get_proc_data(stats_stop)
else:
- print "INFO: ebizzy workload triggerd failed"
+ print("INFO: ebizzy workload triggerd failed")
os.chdir(olddir)
sys.exit(1)
- except Exception, details:
- print "Ebizzy workload trigger failed ", details
+ except Exception as details:
+ print("Ebizzy workload trigger failed ", details)
sys.exit(1)
- except Exception, details:
- print "Ebizzy workload trigger failed ", details
+ except Exception as details:
+ print("Ebizzy workload trigger failed ", details)
sys.exit(1)
def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
@@ -385,7 +385,7 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
if workload_file != "":
benchmark_path = path
else:
- print "INFO: kernbench benchmark not found"
+ print("INFO: kernbench benchmark not found")
os.chdir(olddir)
sys.exit(1)
@@ -398,8 +398,8 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
if linux_source_dir != "":
os.chdir(linux_source_dir)
else:
- print "INFO: Linux kernel source not found in /root. Workload\
- Kernbench cannot be executed"
+ print("INFO: Linux kernel source not found in /root. Workload\
+ Kernbench cannot be executed")
sys.exit(1)
get_proc_data(stats_start)
@@ -428,10 +428,10 @@ def trigger_kernbench (sched_smt, stress, background, pinned, perf_test):
time.sleep(240)
stop_wkld("kernbench")
- print "INFO: Workload kernbench triggerd"
+ print("INFO: Workload kernbench triggerd")
os.chdir(olddir)
- except Exception, details:
- print "Workload kernbench trigger failed ", details
+ except Exception as details:
+ print("Workload kernbench trigger failed ", details)
sys.exit(1)
def trigger_workld(sched_smt, workload, stress, duration, background, pinned, perf_test):
@@ -443,8 +443,8 @@ def trigger_workld(sched_smt, workload, stress, duration, background, pinned, pe
trigger_ebizzy (sched_smt, stress, duration, background, pinned)
if workload == "kernbench":
trigger_kernbench (sched_smt, stress, background, pinned, perf_test)
- except Exception, details:
- print "INFO: Trigger workload failed", details
+ except Exception as details:
+ print("INFO: Trigger workload failed", details)
sys.exit(1)
def generate_report():
@@ -472,29 +472,29 @@ def generate_report():
stats_percentage[l] = percentage_list
for i in range(0, len(cpu_labels)):
- print >> debugfile, cpu_labels[i], '\t',
- print >> debugfile
+ print(cpu_labels[i], '\t', end=' ', file=debugfile)
+ print(file=debugfile)
for l in sorted(stats_stop.keys()):
- print >> debugfile, l, '\t',
+ print(l, '\t', end=' ', file=debugfile)
for i in range(1, len(stats_stop[l])):
- print >> debugfile, stats_stop[l][i], '\t',
- print >> debugfile
+ print(stats_stop[l][i], '\t', end=' ', file=debugfile)
+ print(file=debugfile)
for i in range(0, len(cpu_labels)):
- print >> reportfile, cpu_labels[i], '\t',
- print >> reportfile
+ print(cpu_labels[i], '\t', end=' ', file=reportfile)
+ print(file=reportfile)
for l in sorted(stats_percentage.keys()):
- print >> reportfile, l, '\t',
+ print(l, '\t', end=' ', file=reportfile)
for i in range(1, len(stats_percentage[l])):
- print >> reportfile, " %3.4f" % stats_percentage[l][i],
- print >> reportfile
+ print(" %3.4f" % stats_percentage[l][i], end=' ', file=reportfile)
+ print(file=reportfile)
#Now get the package ID information
try:
- print >> debugfile, "cpu_map: ", cpu_map
+ print("cpu_map: ", cpu_map, file=debugfile)
keyvalfile = open('/procstat/keyval', 'a')
- print >> keyvalfile, "nr_packages=%d" % len(cpu_map)
- print >> keyvalfile, "system-idle=%3.4f" % (stats_percentage['cpu'][4])
+ print("nr_packages=%d" % len(cpu_map), file=keyvalfile)
+ print("system-idle=%3.4f" % (stats_percentage['cpu'][4]), file=keyvalfile)
for pkg in sorted(cpu_map.keys()):
if is_hyper_threaded():
for core in sorted(cpu_map[pkg].keys()):
@@ -511,20 +511,20 @@ def generate_report():
total_idle += stats_stop["cpu%d" % cpu][4]
for i in range(1, len(stats_stop["cpu%d" % cpu])):
total += stats_stop["cpu%d" % cpu][i]
- print >> reportfile, "Package: ", pkg, "Idle %3.4f%%" \
- % (float(total_idle)*100/total)
- print >> keyvalfile, "package-%s=%3.4f" % \
- (pkg, (float(total_idle)*100/total))
- except Exception, details:
- print "Generating utilization report failed: ", details
+ print("Package: ", pkg, "Idle %3.4f%%" \
+ % (float(total_idle)*100/total), file=reportfile)
+ print("package-%s=%3.4f" % \
+ (pkg, (float(total_idle)*100/total)), file=keyvalfile)
+ except Exception as details:
+ print("Generating utilization report failed: ", details)
sys.exit(1)
#Add record delimiter '\n' before closing these files
- print >> debugfile
+ print(file=debugfile)
debugfile.close()
- print >> reportfile
+ print(file=reportfile)
reportfile.close()
- print >> keyvalfile
+ print(file=keyvalfile)
keyvalfile.close()
def generate_loc_intr_report():
@@ -537,17 +537,17 @@ def generate_loc_intr_report():
get_proc_loc_count(intr_stop)
reportfile = open('/procstat/cpu-loc_interrupts', 'a')
- print >> reportfile, "=============================================="
- print >> reportfile, " Local timer interrupt stats "
- print >> reportfile, "=============================================="
+ print("==============================================", file=reportfile)
+ print(" Local timer interrupt stats ", file=reportfile)
+ print("==============================================", file=reportfile)
for i in range(0, cpu_count):
intr_stop[i] = int(intr_stop[i]) - int(intr_start[i])
- print >> reportfile, "CPU%s: %s" %(i, intr_stop[i])
- print >> reportfile
+ print("CPU%s: %s" %(i, intr_stop[i]), file=reportfile)
+ print(file=reportfile)
reportfile.close()
- except Exception, details:
- print "Generating interrupt report failed: ", details
+ except Exception as details:
+ print("Generating interrupt report failed: ", details)
sys.exit(1)
def record_loc_intr_count():
@@ -560,8 +560,8 @@ def record_loc_intr_count():
intr_stat_timer_0.append(intr_stop[i])
intr_start = []
intr_stop = []
- except Exception, details:
- print "INFO: Record interrupt statistics when timer_migration=0",details
+ except Exception as details:
+ print("INFO: Record interrupt statistics when timer_migration=0",details)
def expand_range(range_val):
'''
@@ -578,8 +578,8 @@ def expand_range(range_val):
for j in range(int(hyphen_values[0]), int(hyphen_values[1])+1):
ids_list.append(j)
return(ids_list)
- except Exception, details:
- print "INFO: expand_pkg_grps failed ", details
+ except Exception as details:
+ print("INFO: expand_pkg_grps failed ", details)
def is_quad_core():
'''
@@ -596,8 +596,8 @@ def is_quad_core():
return(1)
else:
return(0)
- except IOError, e:
- print "Failed to get cpu core information", e
+ except IOError as e:
+ print("Failed to get cpu core information", e)
sys.exit(1)
def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
@@ -628,7 +628,7 @@ def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
# in different cores of same package
#if sched_smt_level > 0 :
#return 1
- else:
+ else:
for pkg in sorted(cpu_map.keys()):
pkg_cpus = cpu_map[pkg]
if len(cpu_group) == len(pkg_cpus):
@@ -640,8 +640,8 @@ def validate_cpugrp_map(cpu_group, sched_mc_level, sched_smt_level):
return(1)
- except Exception, details:
- print "Exception in validate_cpugrp_map: ", details
+ except Exception as details:
+ print("Exception in validate_cpugrp_map: ", details)
sys.exit(1)
@@ -680,8 +680,8 @@ def verify_sched_domain_dmesg(sched_mc_level, sched_smt_level):
return(0)
else:
return(1)
- except Exception, details:
- print "Reading dmesg failed", details
+ except Exception as details:
+ print("Reading dmesg failed", details)
sys.exit(1)
def get_cpu_utilization(cpu):
@@ -692,8 +692,8 @@ def get_cpu_utilization(cpu):
if cpu == stats_percentage[l][0]:
return stats_percentage[l][1]
return -1
- except Exception, details:
- print "Exception in get_cpu_utilization", details
+ except Exception as details:
+ print("Exception in get_cpu_utilization", details)
sys.exit(1)
def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level):
@@ -737,7 +737,7 @@ def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level)
if stats_percentage[l][1] > 70:
cpus_utilized.append(int(cpu_id[1]))
cpus_utilized.sort()
- print "INFO: CPU's utilized ", cpus_utilized
+ print("INFO: CPU's utilized ", cpus_utilized)
# If length of CPU's utilized is not = number of jobs exit with 1
if len(cpus_utilized) < threads:
@@ -746,11 +746,11 @@ def validate_cpu_consolidation(stress, work_ld, sched_mc_level, sched_smt_level)
status = validate_cpugrp_map(cpus_utilized, sched_mc_level, \
sched_smt_level)
if status == 1:
- print "INFO: CPUs utilized is not in same package or core"
+ print("INFO: CPUs utilized is not in same package or core")
return(status)
- except Exception, details:
- print "Exception in validate_cpu_consolidation: ", details
+ except Exception as details:
+ print("Exception in validate_cpu_consolidation: ", details)
sys.exit(1)
def get_cpuid_max_intr_count():
@@ -780,13 +780,13 @@ def get_cpuid_max_intr_count():
diff = second_highest - intr_stop[i]
''' Threshold of difference has to be manipulated '''
if diff < 10000:
- print "INFO: Diff in interrupt count is below threshold"
+ print("INFO: Diff in interrupt count is below threshold")
cpus_utilized = []
return cpus_utilized
- print "INFO: Interrupt count in other CPU's low as expected"
+ print("INFO: Interrupt count in other CPU's low as expected")
return cpus_utilized
- except Exception, details:
- print "Exception in get_cpuid_max_intr_count: ", details
+ except Exception as details:
+ print("Exception in get_cpuid_max_intr_count: ", details)
sys.exit(1)
def validate_ilb (sched_mc_level, sched_smt_level):
@@ -799,8 +799,8 @@ def validate_ilb (sched_mc_level, sched_smt_level):
status = validate_cpugrp_map(cpus_utilized, sched_mc_level, sched_smt_level)
return status
- except Exception, details:
- print "Exception in validate_ilb: ", details
+ except Exception as details:
+ print("Exception in validate_ilb: ", details)
sys.exit(1)
def reset_schedmc():
@@ -809,8 +809,8 @@ def reset_schedmc():
try:
os.system('echo 0 > \
/sys/devices/system/cpu/sched_mc_power_savings 2>/dev/null')
- except OSError, e:
- print "Could not set sched_mc_power_savings to 0", e
+ except OSError as e:
+ print("Could not set sched_mc_power_savings to 0", e)
sys.exit(1)
def reset_schedsmt():
@@ -819,8 +819,8 @@ def reset_schedsmt():
try:
os.system('echo 0 > \
/sys/devices/system/cpu/sched_smt_power_savings 2>/dev/null')
- except OSError, e:
- print "Could not set sched_smt_power_savings to 0", e
+ except OSError as e:
+ print("Could not set sched_smt_power_savings to 0", e)
sys.exit(1)
def stop_wkld(work_ld):
@@ -830,6 +830,6 @@ def stop_wkld(work_ld):
os.system('pkill %s 2>/dev/null' %work_ld)
if work_ld == "kernbench":
os.system('pkill make 2>/dev/null')
- except OSError, e:
- print "Exception in stop_wkld", e
+ except OSError as e:
+ print("Exception in stop_wkld", e)
sys.exit(1)
diff --git a/testcases/kernel/power_management/pm_cpu_consolidation.py b/testcases/kernel/power_management/pm_cpu_consolidation.py
index 734db2759..fbe262aad 100755
--- a/testcases/kernel/power_management/pm_cpu_consolidation.py
+++ b/testcases/kernel/power_management/pm_cpu_consolidation.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
''' This Python script interprets various sched stats values.
Validates cpu consolidation for given sched_mc_power_saving value
'''
@@ -79,7 +79,7 @@ def main(argv=None):
generate_report()
status = validate_cpu_consolidation("partial", work_ld, options.mc_value, options.smt_value)
if status == 0:
- print "INFO: Consolidation worked sched_smt &(/) sched_mc is set"
+ print("INFO: Consolidation worked sched_smt &(/) sched_mc is set")
#Disable sched_smt & sched_mc interface values
if options.vary_mc_smt and options.mc_value > 0:
set_sched_mc_power(0)
@@ -107,8 +107,8 @@ def main(argv=None):
else:
return(1)
else:
- print "INFO: CPU consolidation failed when sched_mc &(/) \
-sched_smt was enabled. This is pre-requisite to proceed"
+ print("INFO: CPU consolidation failed when sched_mc &(/) \
+sched_smt was enabled. This is pre-requisite to proceed")
return(status)
else:
#The else part of the code validates behaviour of sched_mc
@@ -118,7 +118,7 @@ sched_smt was enabled. This is pre-requisite to proceed"
if is_hyper_threaded():
set_sched_smt_power(options.smt_value)
map_cpuid_pkgid()
- print "INFO: Created table mapping cpu to package"
+ print("INFO: Created table mapping cpu to package")
background="no"
duration=60
pinned ="no"
@@ -135,8 +135,8 @@ sched_smt was enabled. This is pre-requisite to proceed"
if is_hyper_threaded():
reset_schedsmt()
return(status)
- except Exception, details:
- print "INFO: CPU consolidation failed", details
+ except Exception as details:
+ print(("INFO: CPU consolidation failed", details))
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_ilb_test.py b/testcases/kernel/power_management/pm_ilb_test.py
index 0b447d804..412ceb9f7 100755
--- a/testcases/kernel/power_management/pm_ilb_test.py
+++ b/testcases/kernel/power_management/pm_ilb_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
''' This Python script interprets interrupt values.
Validates Ideal load balancer runs in same package where workload is running
'''
@@ -36,7 +36,7 @@ def main(argv=None):
if is_hyper_threaded():
set_sched_smt_power(options.smt_level)
map_cpuid_pkgid()
- print "INFO: Created table mapping cpu to package"
+ print("INFO: Created table mapping cpu to package")
background="no"
duration=120
pinned="yes"
@@ -49,8 +49,8 @@ def main(argv=None):
reset_schedsmt()
return(status)
- except Exception, details:
- print "INFO: Idle Load Balancer test failed", details
+ except Exception as details:
+ print(("INFO: Idle Load Balancer test failed", details))
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_sched_domain.py b/testcases/kernel/power_management/pm_sched_domain.py
index a54b0e9be..0ada3eea4 100755
--- a/testcases/kernel/power_management/pm_sched_domain.py
+++ b/testcases/kernel/power_management/pm_sched_domain.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
''' This Python script validates sched domain information in dmesg
with information in sysfs topology
'''
@@ -43,10 +43,10 @@ def main(argv=None):
reset_schedsmt()
return(status)
else:
- print "INFO: Invalid arguments given"
+ print("INFO: Invalid arguments given")
return 1
- except Exception, details:
- print "INFO: sched domain test failed: ", details
+ except Exception as details:
+ print(("INFO: sched domain test failed: ", details))
return(1)
# Run test based on the command line arguments
diff --git a/testcases/network/nfsv4/acl/cleangroups.py b/testcases/network/nfsv4/acl/cleangroups.py
index 341746e83..11f8045b5 100755
--- a/testcases/network/nfsv4/acl/cleangroups.py
+++ b/testcases/network/nfsv4/acl/cleangroups.py
@@ -1,6 +1,7 @@
+#!/usr/bin/python3
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/cleanusers.py b/testcases/network/nfsv4/acl/cleanusers.py
index 7ac435087..f2597d27e 100755
--- a/testcases/network/nfsv4/acl/cleanusers.py
+++ b/testcases/network/nfsv4/acl/cleanusers.py
@@ -1,6 +1,7 @@
+#!/usr/bin/python3
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/create_users.py b/testcases/network/nfsv4/acl/create_users.py
index 568cb9a42..0dcaecbe9 100755
--- a/testcases/network/nfsv4/acl/create_users.py
+++ b/testcases/network/nfsv4/acl/create_users.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
'''
Access Control Lists testing based on newpynfs framework
Aurelien Charbon - Bull SA
diff --git a/testcases/network/nfsv4/acl/random_gen.py b/testcases/network/nfsv4/acl/random_gen.py
index d39dbb3db..735dc1de9 100755
--- a/testcases/network/nfsv4/acl/random_gen.py
+++ b/testcases/network/nfsv4/acl/random_gen.py
@@ -1,4 +1,5 @@
-import commands
+#!/usr/bin/python3
+import subprocess
import random
import re
@@ -30,20 +31,20 @@ class RandomGen(object):
def createUser(self,username):
group = self.gList[random.randint(0,len(self.gList)-1)][0]
opts = "-g" + group + " -p" + "1pilot" + " -m " + username
- u = commands.getoutput('/usr/sbin/useradd '+ opts)
+ u = subprocess.getoutput('/usr/sbin/useradd '+ opts)
if u != "":
- print "create user " + username + "failed" + u
+ print(("create user " + username + "failed" + u))
def createFile(self,path,n):
for i in range(n):
fName = 'file' + str(i)
- u = commands.getoutput('touch ' + path + '/'+ fName)
+ u = subprocess.getoutput('touch ' + path + '/'+ fName)
self.fList.append(fName)
def createGroup(self, grpname, gid):
- u = commands.getoutput('/usr/sbin/groupadd -g' + gid + " " + grpname)
+ u = subprocess.getoutput('/usr/sbin/groupadd -g' + gid + " " + grpname)
if u != "":
- print u
+ print(u)
def createNGroup(self, n):
for i in range(n):
@@ -61,13 +62,13 @@ class RandomGen(object):
""" clean all users created to do the tests """
def cleanUsers(self):
for name in self.uList:
- u = commands.getoutput('/usr/sbin/userdel -r '+ name)
+ u = subprocess.getoutput('/usr/sbin/userdel -r '+ name)
self.uList = []
""" clean all users created to do the tests """
def cleanGroups(self):
for name in self.gList:
- u = commands.getoutput('/usr/sbin/groupdel '+ name[0])
+ u = subprocess.getoutput('/usr/sbin/groupdel '+ name[0])
self.gList = []
""" Retrieve the list of user from /etc/passwd file """
@@ -86,7 +87,7 @@ class RandomGen(object):
f.close()
def getFileList(self,path):
- u = commands.getoutput('ls ' + path)
+ u = subprocess.getoutput('ls ' + path)
tmp = u.split('\n')
for i in range (len(tmp)-1):
NameOK = re.match("file",tmp[i])
@@ -142,10 +143,10 @@ class RandomGen(object):
f.close()
def printUserList(self):
- print self.uList
+ print((self.uList))
def printGroupList(self):
- print self.gList
+ print((self.gList))
""" Create a random name of random length """
def createOneNameRandomLength(self,maxlength):
@@ -196,12 +197,12 @@ class RandomGen(object):
def createRandomMode(self):
out_str = ""
while (out_str == ""):
- if random.randint(0,1) == 1:
- out_str += 'x'
- if random.randint(0,1) == 1:
- out_str += 'w'
- if random.randint(0,1) == 1:
- out_str += 'r'
+ if random.randint(0,1) == 1:
+ out_str += 'x'
+ if random.randint(0,1) == 1:
+ out_str += 'w'
+ if random.randint(0,1) == 1:
+ out_str += 'r'
return out_str
""" Create a random ACL operation (delete / remove / modify on user / group ) """
@@ -211,19 +212,19 @@ class RandomGen(object):
file = self.fList[random.randint(0,len(self.fList)-1)]
if a == 1: # creation/modification
user = self.uList[random.randint(0,len(self.uList)-1)]
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + file)
if a == 2: # with group
group = self.gList[random.randint(0,len(self.gList)-1)][0]
- u = commands.getoutput('setfacl -m g:' + group + ':' + mode + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -m g:' + group + ':' + mode + " " + path + "/" + file)
if a == 3: # deletation
user = self.uList[random.randint(0,len(self.uList)-1)]
- u = commands.getoutput('setfacl -x u:' + user + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -x u:' + user + " " + path + "/" + file)
if a == 4: # with group
group = self.gList[random.randint(0,len(self.gList)-1)][0]
- u = commands.getoutput('setfacl -x g:' + group + " " + path + "/" + file)
+ u = subprocess.getoutput('setfacl -x g:' + group + " " + path + "/" + file)
# request on a unexisting group
'''if a == 5:
diff --git a/testcases/network/nfsv4/acl/setacl_stress.py b/testcases/network/nfsv4/acl/setacl_stress.py
index 3713ff6a9..68a493274 100755
--- a/testcases/network/nfsv4/acl/setacl_stress.py
+++ b/testcases/network/nfsv4/acl/setacl_stress.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
'''
Access Control Lists stressing script
To lauch on the first client
@@ -6,7 +7,7 @@
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import random
diff --git a/testcases/network/nfsv4/acl/test_acl.py b/testcases/network/nfsv4/acl/test_acl.py
index d29c0e3f1..612b9e472 100755
--- a/testcases/network/nfsv4/acl/test_acl.py
+++ b/testcases/network/nfsv4/acl/test_acl.py
@@ -1,9 +1,10 @@
+#!/usr/bin/python3
'''
Access Control Lists testing based on newpynfs framework
Aurelien Charbon - Bull SA
'''
from random_gen import *
-import commands
+import subprocess
import os
import threading
import time
@@ -15,18 +16,18 @@ t_alphabet=len(alphabet)
def test_acl_default(path):
# set default acl on the test directory
- u = commands.getoutput('mkdir ' + path + "/" + testdir)
- u = commands.getoutput('getfacl ' + path + "/" + testdir)
+ u = subprocess.getoutput('mkdir ' + path + "/" + testdir)
+ u = subprocess.getoutput('getfacl ' + path + "/" + testdir)
acl=[]
- for i in range (len(splitedresult)-1)
+ for i in range (len(splitedresult)-1):
splitedline = splitedresult[i].split('::')
name = splitedline[0]
entry = splitedline[1]
acl.append(name,entry)
# create a file in this directory
- u = commands.getoutput('touch ' + path + "/" + testdir + testfile)
+ u = subprocess.getoutput('touch ' + path + "/" + testdir + testfile)
# get the file's ACL and verify
- u = commands.getoutput('getfacl ' + path + "/" + testdir + testfile)
+ u = subprocess.getoutput('getfacl ' + path + "/" + testdir + testfile)
splitedresult = u.split('\n')
acl2=[]
for i in range (len(splitedresult)-1):
@@ -37,10 +38,10 @@ def test_acl_default(path):
result_final = True
while i < len(acl2):
- result = False:
- while j < len(acl2) and result = False:
+ result = False
+ while j < len(acl2) and result == False:
if acl2[i] == acl[j]:
- result = True
+ result = True
if result == False:
result_final = False
@@ -55,29 +56,28 @@ def test_acl_long():
for test_file in test.fList:
for user in test.uList:
mode = test.createRandomMode()
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + test_file)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + test_file)
t1=time.time()
- print t1-t0
+ print(t1-t0)
def test_nfs_acl():
- print "test acl 10000\n"
+ print("test acl 10000\n")
test = RandomGen()
f = open('/tmp/acl-result-10000','w')
-
- path = '/mnt/nfs/test-acl'
+ path = '/mnt/nfs/test-acl'
for i in range(10000):
- print "test avec " + str(i) + " ACE"
+ print("test avec " + str(i) + " ACE")
test.getUserList()
testfile = 'testfile' + str(i)
- u = commands.getoutput('touch ' + path + "/" + testfile)
+ u = subprocess.getoutput('touch ' + path + "/" + testfile)
t0=time.time()
- for j in range(i):
+ for j in range(i):
user = test.uList.pop()
mode = test.createRandomMode()
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
- t1=time.time()
- f.write(str(i) + "\t" + str(t1-t0)+"\n")
- f.close()
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
+ t1=time.time()
+ f.write(str(i) + "\t" + str(t1-t0)+"\n")
+ f.close()
def test_nfs_getfacl():
@@ -85,27 +85,27 @@ def test_nfs_getfacl():
test = RandomGen()
path = '/mnt/nfs/test-acl' # NFS mounted directory
- u = commands.getoutput('rm ' + path + "/*") # clean directory
- print "test acl getfacl\n"
+ u = subprocess.getoutput('rm ' + path + "/*") # clean directory
+ print("test acl getfacl\n")
f = open('/tmp/acl-result-getfacl','w')
for i in range(37):
test.getUserList()
testfile = 'testfile' + str(i)
- u = commands.getoutput('touch ' + path + "/" + testfile)
- print "setfacl " + str(i) + " " + u
+ u = subprocess.getoutput('touch ' + path + "/" + testfile)
+ print("setfacl " + str(i) + " " + u)
for j in range(i):
user = test.uList.pop()
mode = test.createRandomMode()
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
t1=time.time()
- u = commands.getoutput('getfacl ' + path + "/" + testfile)
- print "getfacl - " + str(i) + u + "\n"
+ u = subprocess.getoutput('getfacl ' + path + "/" + testfile)
+ print("getfacl - " + str(i) + u + "\n")
t2=time.time()
f.write(str(i) + "\t" + str(t2-t1)+"\n")
- f.close()
+ f.close()
def main():
@@ -113,7 +113,7 @@ def main():
path = '/mnt/nfs/test-acl'
test = RandomGen()
test.getFileList(path)
- print test.fList
+ print(test.fList)
main()
diff --git a/testcases/network/nfsv4/acl/test_long_acl.py b/testcases/network/nfsv4/acl/test_long_acl.py
index a7c8cb1a1..fae640dd5 100755
--- a/testcases/network/nfsv4/acl/test_long_acl.py
+++ b/testcases/network/nfsv4/acl/test_long_acl.py
@@ -1,10 +1,11 @@
+#!/usr/bin/python3
'''
Access Control Lists testing based on newpynfs framework
Aurelien Charbon - Bull SA
'''
from random_gen import *
from optparse import OptionParser
-import commands
+import subprocess
import os
import threading
import time
@@ -19,20 +20,20 @@ def test_longacl(l,path):
# mesures sur le getfacl
test = RandomGen()
- u = commands.getoutput('rm ' + path + "/*") # clean directory
- print "test acl getfacl\n"
+ u = subprocess.getoutput('rm ' + path + "/*") # clean directory
+ print("test acl getfacl\n")
for i in range(l):
test.getUserList()
testfile = 'testfile' + str(i)
- u = commands.getoutput('touch ' + path + "/" + testfile)
- print "setfacl with " + str(i) + " entries\n " + u
+ u = subprocess.getoutput('touch ' + path + "/" + testfile)
+ print(("setfacl with " + str(i) + " entries\n " + u))
for j in range(i):
user = test.uList.pop()
mode = test.createRandomMode()
- u = commands.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
- if u != "":
- print "setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile
- print u
+ u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
+ if u != "":
+ print(("setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile))
+ print(u)
def main():
parser = OptionParser()
parser.add_option("-l", "--length", dest="length",type="int",help="max lentgh of ACL")
diff --git a/testcases/network/nfsv4/locks/locktests.py b/testcases/network/nfsv4/locks/locktests.py
index dd518ab6e..42cb18487 100755
--- a/testcases/network/nfsv4/locks/locktests.py
+++ b/testcases/network/nfsv4/locks/locktests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# This script aims to help to run locktests with several clients.
#
# Report bugs to Vincent ROQUETA : vincent.roqueta@ext.bull.net
@@ -38,8 +38,8 @@ class Machine:
self.do()
def printc(self):
- print "->"+self.command
- print "\n"
+ print(("->"+self.command))
+ print("\n")
class Client(Machine):
@@ -95,27 +95,27 @@ class Serveur(Machine):
self.unexport(unexportDir)
self.rmdir(unexportDir)
def usage():
- print "\n"
- print "usage:"
- print "locktests.py <-n process -f testfile ><--setup -s fs_server> -c host1, host2, host3 ... "
- print "--setup : setup the configuration, deploy test on other test machines; This option also requires -c and -s"
- print "-c <machine> : host list to deploy/run/clean the test"
- print "-s <machine> : NFS server to use to setup the test"
- print "-n <num> : number of processes each test machine will lauch to perform the test"
- print "-f <file> : test file. This must be the same on each machine"
- print " "
- print "Example :"
- print "========="
- print "*Setup machines for testing"
- print "./locktests.py --setup -c testmachine1 testmachine2 testmachine3 -s my_nfs_server:/"
- print "\n"
- print "*Run test on testmachine1,testmachine2 with 50 process on each machine using /mnt/nfsv4/testfile"
- print "./locktests.py -n 50 -f /mnt/nfsv4/testfile -c testmachine1 testmachine2"
- print "\n"
- print "_________________________________"
- print "Vincent ROQUETA - Bull SA - 2005\n"
-
- return 0
+ print("\n")
+ print("usage:")
+ print("locktests.py <-n process -f testfile ><--setup -s fs_server> -c host1, host2, host3 ... ")
+ print("--setup : setup the configuration, deploy test on other test machines; This option also requires -c and -s")
+ print("-c <machine> : host list to deploy/run/clean the test")
+ print("-s <machine> : NFS server to use to setup the test")
+ print("-n <num> : number of processes each test machine will lauch to perform the test")
+ print("-f <file> : test file. This must be the same on each machine")
+ print(" ")
+ print("Example :")
+ print("=========")
+ print("*Setup machines for testing")
+ print("./locktests.py --setup -c testmachine1 testmachine2 testmachine3 -s my_nfs_server:/")
+ print("\n")
+ print("*Run test on testmachine1,testmachine2 with 50 process on each machine using /mnt/nfsv4/testfile")
+ print("./locktests.py -n 50 -f /mnt/nfsv4/testfile -c testmachine1 testmachine2")
+ print("\n")
+ print("_________________________________")
+ print("Vincent ROQUETA - Bull SA - 2005\n")
+
+ return 0
@@ -124,14 +124,14 @@ def setup():
fichier=SRC_PATH+"/"+SRC
commande=""
for i in clients:
- print "Setting up machine "+i
+ print(("Setting up machine "+i))
c=Client(i)
c.mkdir(path)
c.cp(fichier, path)
c.install(path)
c.isomount(NFS4_PATH)
#Setup localhost
- print "Setting up localhost"
+ print("Setting up localhost")
commande="make; mkdir -p "+NFS4_PATH+" ; mount -t nfs4 "+NFS4_SERVER+" "+NFS4_PATH+" &"
os.system(commande)
@@ -159,7 +159,7 @@ def clean():
args=sys.argv[1:]
-rge=range(len(args))
+rge=list(range(len(args)))
a=""
r=True
s=False
@@ -213,17 +213,17 @@ if s:
if (not c) or (not nfsServer):
usage()
sys.exit(1)
- print "Setup"
- print NFS4_SERVER
+ print("Setup")
+ print(NFS4_SERVER)
setup()
- print "Setup complete"
+ print("Setup complete")
if r:
if (not c) or (not f) or (not n):
usage()
sys.exit(1)
- print "Running test"
+ print("Running test")
run()
diff --git a/testcases/realtime/func/pi-tests/parse-testpi1.py b/testcases/realtime/func/pi-tests/parse-testpi1.py
index df5ee6815..0631cce94 100644
--- a/testcases/realtime/func/pi-tests/parse-testpi1.py
+++ b/testcases/realtime/func/pi-tests/parse-testpi1.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
################################################################################
@@ -38,16 +39,13 @@ class TestPi1(Log):
exp3=re.compile("[1-9]\d{2,3}")
flag=False
for line in self.read():
- if exp1.search(line) and exp2.search(prev_line)and exp3.search(prev_line):
- list=prev_line.split(" ")
- if int(list[4])< 9900:
- flag=True
- else:
+ if exp1.search(line) and exp2.search(prev_line)and exp3.search(prev_line):
+ list=prev_line.split(" ")
+ if int(list[4])< 9900:
+ flag=True
+ else:
flag=False
-
-
-
- prev_line=line
+ prev_line=line
return flag
def main():
diff --git a/testcases/realtime/func/pi-tests/parse-testpi2.py b/testcases/realtime/func/pi-tests/parse-testpi2.py
index 02db68c02..f11ff8ae7 100644
--- a/testcases/realtime/func/pi-tests/parse-testpi2.py
+++ b/testcases/realtime/func/pi-tests/parse-testpi2.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
################################################################################
@@ -41,17 +42,17 @@ class TestPi2(Log):
count=0
flag=True
for line in self.read():
- if exp1.search(line) and exp2.search(prev_line)and exp3.search(prev_line):
- list=prev_line.split(" ")
- if int(list[4])<= 9900:
- count+=1
+ if exp1.search(line) and exp2.search(prev_line) and exp3.search(prev_line):
+ list=prev_line.split(" ")
+ if int(list[4])<= 9900:
+ count+=1
flag=True
- elif count == 0:
+ elif count == 0:
return False
- prev_line=line
+ prev_line=line
if count>=2:
return True
else:
@@ -66,4 +67,4 @@ def main():
sys.exit("Result: %s " % (["FAIL", "PASS"][log.eval()]))
if __name__ == "__main__":
- main()
+ main()
diff --git a/testcases/realtime/scripts/parser.py b/testcases/realtime/scripts/parser.py
index 6b2dc7370..bc4512f33 100644
--- a/testcases/realtime/scripts/parser.py
+++ b/testcases/realtime/scripts/parser.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
################################################################################
@@ -29,18 +30,18 @@
import sys
class Log:
- def __init__(self,filename):
- if filename:
- log_file=filename
+ def __init__(self,filename):
+ if filename:
+ log_file=filename
try:
- self.__log_file = open(log_file, "r")
- except IOError, errmsg:
- sys.exit(errmsg)
+ self.__log_file = open(log_file, "r")
+ except IOError as errmsg:
+ sys.exit(errmsg)
- def read(self):
- for line in self.__log_file.read().split("\n"):
- yield line
+ def read(self):
+ for line in self.__log_file.read().split("\n"):
+ yield line
self.__log_file.close()
- def eval(self):
- pass
+ def eval(self):
+ pass
diff --git a/testcases/realtime/tools/ftqviz.py b/testcases/realtime/tools/ftqviz.py
index 19ae093a0..1cd07b408 100644
--- a/testcases/realtime/tools/ftqviz.py
+++ b/testcases/realtime/tools/ftqviz.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# Filename: ftqviz.py
# Author: Darren Hart <dvhltc@us.ibm.com>
@@ -37,7 +37,7 @@ NS_PER_US = 1000
def smooth(x, wlen):
if x.size < wlen:
- raise ValueError, "Input vector needs to be bigger than window size."
+ raise ValueError("Input vector needs to be bigger than window size.")
# reflect the signal to avoid transients... ?
s = r_[2*x[0]-x[wlen:1:-1], x, 2*x[-1]-x[-1:-wlen:-1]]
@@ -62,8 +62,8 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# same factor
ns_per_sample = NS_PER_S / sample_hz
- print "Interpolated Sample Rate: ", sample_hz, " HZ"
- print "Hamming Window Length: ", wlen
+ print(("Interpolated Sample Rate: ", sample_hz, " HZ"))
+ print(("Hamming Window Length: ", wlen))
t = fromfile(timefile, dtype=int64, sep='\n')
x = fromfile(countfile, dtype=int64, sep='\n')
@@ -83,7 +83,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# smooth the signal (low pass filter)
try:
y = smooth(xi, wlen)
- except ValueError, e:
+ except ValueError as e:
exit(e)
# generate the fft
@@ -121,7 +121,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
def usage():
- print "usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]"
+ print(("usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]"))
if __name__=='__main__':
@@ -143,7 +143,7 @@ if __name__=='__main__':
usage()
exit()
if o == "-s":
- sample_hz = long(a)
+ sample_hz = int@
if o == "-t":
times_file = a
if o == "-w":
diff --git a/testscripts/build/ltp-missing-install-files.py b/testscripts/build/ltp-missing-install-files.py
index 1ab40a09f..11465a725 100755
--- a/testscripts/build/ltp-missing-install-files.py
+++ b/testscripts/build/ltp-missing-install-files.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#
# Script for determining items missing from LTP install based on the output
# log provided by runltp[lite.sh].
@@ -111,6 +111,6 @@ for logfile in logfiles:
fd.close()
if len(missing_ents):
- print "\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents])
+ print(("\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents])))
elif opts.verbose:
- print "%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile)
+ print(("%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile)))
diff --git a/tools/pounder21/src/time_tests/drift-test.py b/tools/pounder21/src/time_tests/drift-test.py
index aba1909e3..0c2575659 100755
--- a/tools/pounder21/src/time_tests/drift-test.py
+++ b/tools/pounder21/src/time_tests/drift-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# Time Drift Script
# Periodically checks and displays time drift
@@ -24,7 +24,7 @@
# Usage: drift-test.py [-s] [ntp_server [sleep_time]]
-import commands
+import subprocess
import sys
import string
import time
@@ -52,9 +52,9 @@ if sleep_time == 0:
#set time
if (set_time == 1):
- cmd = commands.getoutput('/usr/sbin/ntpdate -ub ' + server)
+ cmd = subprocess.getoutput('/usr/sbin/ntpdate -ub ' + server)
-cmd = commands.getoutput('/usr/sbin/ntpdate -uq ' + server)
+cmd = subprocess.getoutput('/usr/sbin/ntpdate -uq ' + server)
line = string.split(cmd)
#parse original offset
@@ -65,7 +65,7 @@ datestr = time.strftime("%d %b %Y %H:%M:%S", start_time)
time.sleep(1)
while 1:
- cmd = commands.getoutput('/usr/sbin/ntpdate -uq ' + server)
+ cmd = subprocess.getoutput('/usr/sbin/ntpdate -uq ' + server)
line = string.split(cmd)
#parse offset
@@ -81,9 +81,9 @@ while 1:
drift = delta_offset / delta_time * 1000000
#print output
- print time.strftime("%d %b %H:%M:%S",now_time),
- print " offset:", now_offset ,
- print " drift:", drift ,"ppm"
+ print(time.strftime("%d %b %H:%M:%S",now_time), end=' ')
+ print(" offset:", now_offset, end=' ')
+ print(" drift:", drift ,"ppm")
sys.stdout.flush()
#sleep
--
2.13.6
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH v3] *.py : convert python2 to python3
2018-04-23 8:12 ` [LTP] [PATCH v3] " Yong Sun
@ 2018-04-24 9:05 ` Petr Vorel
2018-04-25 10:22 ` Xiao Yang
0 siblings, 1 reply; 12+ messages in thread
From: Petr Vorel @ 2018-04-24 9:05 UTC (permalink / raw)
To: ltp
Hi Yosun,
> From: yosun <yosun@suse.com>
> 1. Convert python code to use python3
> 2. Make shebang same as standard python shebang
> 3. Correct format to solve compiling error in python3
> Signed-off-by: Yong Sun <yosun@suse.com>
> ---
Accepted with removing double brackets (see diff bellow; I guess you run 2to3 twice, in
that case it would be printed as list).
Thanks for your contribution!
Kind regards,
Petr
diff --git a/testcases/kernel/power_management/pm_cpu_consolidation.py b/testcases/kernel/power_management/pm_cpu_consolidation.py
index fbe262aad..ecd2e4fac 100755
--- a/testcases/kernel/power_management/pm_cpu_consolidation.py
+++ b/testcases/kernel/power_management/pm_cpu_consolidation.py
@@ -136,7 +136,7 @@ sched_smt was enabled. This is pre-requisite to proceed")
reset_schedsmt()
return(status)
except Exception as details:
- print(("INFO: CPU consolidation failed", details))
+ print("INFO: CPU consolidation failed", details)
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_ilb_test.py b/testcases/kernel/power_management/pm_ilb_test.py
index 412ceb9f7..920c4e354 100755
--- a/testcases/kernel/power_management/pm_ilb_test.py
+++ b/testcases/kernel/power_management/pm_ilb_test.py
@@ -50,7 +50,7 @@ def main(argv=None):
return(status)
except Exception as details:
- print(("INFO: Idle Load Balancer test failed", details))
+ print("INFO: Idle Load Balancer test failed", details)
return(1)
if __name__ == "__main__":
diff --git a/testcases/kernel/power_management/pm_sched_domain.py b/testcases/kernel/power_management/pm_sched_domain.py
index 0ada3eea4..d5cd327f3 100755
--- a/testcases/kernel/power_management/pm_sched_domain.py
+++ b/testcases/kernel/power_management/pm_sched_domain.py
@@ -46,7 +46,7 @@ def main(argv=None):
print("INFO: Invalid arguments given")
return 1
except Exception as details:
- print(("INFO: sched domain test failed: ", details))
+ print("INFO: sched domain test failed: ", details)
return(1)
# Run test based on the command line arguments
diff --git a/testcases/network/nfsv4/acl/random_gen.py b/testcases/network/nfsv4/acl/random_gen.py
index 735dc1de9..37cb17945 100755
--- a/testcases/network/nfsv4/acl/random_gen.py
+++ b/testcases/network/nfsv4/acl/random_gen.py
@@ -33,7 +33,7 @@ class RandomGen(object):
opts = "-g" + group + " -p" + "1pilot" + " -m " + username
u = subprocess.getoutput('/usr/sbin/useradd '+ opts)
if u != "":
- print(("create user " + username + "failed" + u))
+ print("create user " + username + "failed" + u)
def createFile(self,path,n):
for i in range(n):
@@ -143,10 +143,10 @@ class RandomGen(object):
f.close()
def printUserList(self):
- print((self.uList))
+ print(self.uList)
def printGroupList(self):
- print((self.gList))
+ print(self.gList)
""" Create a random name of random length """
def createOneNameRandomLength(self,maxlength):
diff --git a/testcases/network/nfsv4/acl/test_long_acl.py b/testcases/network/nfsv4/acl/test_long_acl.py
index fae640dd5..79e3a96bc 100755
--- a/testcases/network/nfsv4/acl/test_long_acl.py
+++ b/testcases/network/nfsv4/acl/test_long_acl.py
@@ -26,13 +26,13 @@ def test_longacl(l,path):
test.getUserList()
testfile = 'testfile' + str(i)
u = subprocess.getoutput('touch ' + path + "/" + testfile)
- print(("setfacl with " + str(i) + " entries\n " + u))
+ print("setfacl with " + str(i) + " entries\n " + u)
for j in range(i):
user = test.uList.pop()
mode = test.createRandomMode()
u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
if u != "":
- print(("setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile))
+ print("setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile)
print(u)
def main():
parser = OptionParser()
diff --git a/testcases/network/nfsv4/locks/locktests.py b/testcases/network/nfsv4/locks/locktests.py
index 42cb18487..80d8c2051 100755
--- a/testcases/network/nfsv4/locks/locktests.py
+++ b/testcases/network/nfsv4/locks/locktests.py
@@ -38,7 +38,7 @@ class Machine:
self.do()
def printc(self):
- print(("->"+self.command))
+ print("->"+self.command)
print("\n")
class Client(Machine):
@@ -124,7 +124,7 @@ def setup():
fichier=SRC_PATH+"/"+SRC
commande=""
for i in clients:
- print(("Setting up machine "+i))
+ print("Setting up machine "+i)
c=Client(i)
c.mkdir(path)
c.cp(fichier, path)
diff --git a/testcases/realtime/tools/ftqviz.py b/testcases/realtime/tools/ftqviz.py
index 1cd07b408..f331d3375 100644
--- a/testcases/realtime/tools/ftqviz.py
+++ b/testcases/realtime/tools/ftqviz.py
@@ -62,8 +62,8 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
# same factor
ns_per_sample = NS_PER_S / sample_hz
- print(("Interpolated Sample Rate: ", sample_hz, " HZ"))
- print(("Hamming Window Length: ", wlen))
+ print("Interpolated Sample Rate: ", sample_hz, " HZ")
+ print("Hamming Window Length: ", wlen)
t = fromfile(timefile, dtype=int64, sep='\n')
x = fromfile(countfile, dtype=int64, sep='\n')
@@ -121,7 +121,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
def usage():
- print(("usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]"))
+ print("usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]")
if __name__=='__main__':
diff --git a/testscripts/build/ltp-missing-install-files.py b/testscripts/build/ltp-missing-install-files.py
index 11465a725..232028bd1 100755
--- a/testscripts/build/ltp-missing-install-files.py
+++ b/testscripts/build/ltp-missing-install-files.py
@@ -111,6 +111,6 @@ for logfile in logfiles:
fd.close()
if len(missing_ents):
- print(("\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents])))
+ print("\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents]))
elif opts.verbose:
- print(("%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile)))
+ print("%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile))
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [LTP] [PATCH v3] *.py : convert python2 to python3
2018-04-24 9:05 ` Petr Vorel
@ 2018-04-25 10:22 ` Xiao Yang
2018-04-25 13:58 ` Petr Vorel
0 siblings, 1 reply; 12+ messages in thread
From: Xiao Yang @ 2018-04-25 10:22 UTC (permalink / raw)
To: ltp
On 2018/04/24 17:05, Petr Vorel wrote:
> Hi Yosun,
>
>> From: yosun<yosun@suse.com>
>> 1. Convert python code to use python3
>> 2. Make shebang same as standard python shebang
>> 3. Correct format to solve compiling error in python3
>> Signed-off-by: Yong Sun<yosun@suse.com>
>> ---
> Accepted with removing double brackets (see diff bellow; I guess you run 2to3 twice, in
> that case it would be printed as list).
>
> Thanks for your contribution!
Hi Petr,
It seems that many distros still use python2 interpreter instead of python3 by default.
Do you want to install python3 package forcely before testing python code in ltp?
Is it necessary to make sure all python3 code are compatible with python2 interpreter?
Thanks,
Xiao Yang
>
> Kind regards,
> Petr
>
> diff --git a/testcases/kernel/power_management/pm_cpu_consolidation.py b/testcases/kernel/power_management/pm_cpu_consolidation.py
> index fbe262aad..ecd2e4fac 100755
> --- a/testcases/kernel/power_management/pm_cpu_consolidation.py
> +++ b/testcases/kernel/power_management/pm_cpu_consolidation.py
> @@ -136,7 +136,7 @@ sched_smt was enabled. This is pre-requisite to proceed")
> reset_schedsmt()
> return(status)
> except Exception as details:
> - print(("INFO: CPU consolidation failed", details))
> + print("INFO: CPU consolidation failed", details)
> return(1)
>
> if __name__ == "__main__":
> diff --git a/testcases/kernel/power_management/pm_ilb_test.py b/testcases/kernel/power_management/pm_ilb_test.py
> index 412ceb9f7..920c4e354 100755
> --- a/testcases/kernel/power_management/pm_ilb_test.py
> +++ b/testcases/kernel/power_management/pm_ilb_test.py
> @@ -50,7 +50,7 @@ def main(argv=None):
> return(status)
>
> except Exception as details:
> - print(("INFO: Idle Load Balancer test failed", details))
> + print("INFO: Idle Load Balancer test failed", details)
> return(1)
>
> if __name__ == "__main__":
> diff --git a/testcases/kernel/power_management/pm_sched_domain.py b/testcases/kernel/power_management/pm_sched_domain.py
> index 0ada3eea4..d5cd327f3 100755
> --- a/testcases/kernel/power_management/pm_sched_domain.py
> +++ b/testcases/kernel/power_management/pm_sched_domain.py
> @@ -46,7 +46,7 @@ def main(argv=None):
> print("INFO: Invalid arguments given")
> return 1
> except Exception as details:
> - print(("INFO: sched domain test failed: ", details))
> + print("INFO: sched domain test failed: ", details)
> return(1)
>
> # Run test based on the command line arguments
> diff --git a/testcases/network/nfsv4/acl/random_gen.py b/testcases/network/nfsv4/acl/random_gen.py
> index 735dc1de9..37cb17945 100755
> --- a/testcases/network/nfsv4/acl/random_gen.py
> +++ b/testcases/network/nfsv4/acl/random_gen.py
> @@ -33,7 +33,7 @@ class RandomGen(object):
> opts = "-g" + group + " -p" + "1pilot" + " -m " + username
> u = subprocess.getoutput('/usr/sbin/useradd '+ opts)
> if u != "":
> - print(("create user " + username + "failed" + u))
> + print("create user " + username + "failed" + u)
>
> def createFile(self,path,n):
> for i in range(n):
> @@ -143,10 +143,10 @@ class RandomGen(object):
> f.close()
>
> def printUserList(self):
> - print((self.uList))
> + print(self.uList)
>
> def printGroupList(self):
> - print((self.gList))
> + print(self.gList)
>
> """ Create a random name of random length """
> def createOneNameRandomLength(self,maxlength):
> diff --git a/testcases/network/nfsv4/acl/test_long_acl.py b/testcases/network/nfsv4/acl/test_long_acl.py
> index fae640dd5..79e3a96bc 100755
> --- a/testcases/network/nfsv4/acl/test_long_acl.py
> +++ b/testcases/network/nfsv4/acl/test_long_acl.py
> @@ -26,13 +26,13 @@ def test_longacl(l,path):
> test.getUserList()
> testfile = 'testfile' + str(i)
> u = subprocess.getoutput('touch ' + path + "/" + testfile)
> - print(("setfacl with " + str(i) + " entries\n " + u))
> + print("setfacl with " + str(i) + " entries\n " + u)
> for j in range(i):
> user = test.uList.pop()
> mode = test.createRandomMode()
> u = subprocess.getoutput('setfacl -m u:' + user + ':' + mode + " " + path + "/" + testfile)
> if u != "":
> - print(("setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile))
> + print("setfacl -m u:" + user + ':' + mode + " " + path + "/" + testfile)
> print(u)
> def main():
> parser = OptionParser()
> diff --git a/testcases/network/nfsv4/locks/locktests.py b/testcases/network/nfsv4/locks/locktests.py
> index 42cb18487..80d8c2051 100755
> --- a/testcases/network/nfsv4/locks/locktests.py
> +++ b/testcases/network/nfsv4/locks/locktests.py
> @@ -38,7 +38,7 @@ class Machine:
> self.do()
>
> def printc(self):
> - print(("->"+self.command))
> + print("->"+self.command)
> print("\n")
>
> class Client(Machine):
> @@ -124,7 +124,7 @@ def setup():
> fichier=SRC_PATH+"/"+SRC
> commande=""
> for i in clients:
> - print(("Setting up machine "+i))
> + print("Setting up machine "+i)
> c=Client(i)
> c.mkdir(path)
> c.cp(fichier, path)
> diff --git a/testcases/realtime/tools/ftqviz.py b/testcases/realtime/tools/ftqviz.py
> index 1cd07b408..f331d3375 100644
> --- a/testcases/realtime/tools/ftqviz.py
> +++ b/testcases/realtime/tools/ftqviz.py
> @@ -62,8 +62,8 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
> # same factor
> ns_per_sample = NS_PER_S / sample_hz
>
> - print(("Interpolated Sample Rate: ", sample_hz, " HZ"))
> - print(("Hamming Window Length: ", wlen))
> + print("Interpolated Sample Rate: ", sample_hz, " HZ")
> + print("Hamming Window Length: ", wlen)
>
> t = fromfile(timefile, dtype=int64, sep='\n')
> x = fromfile(countfile, dtype=int64, sep='\n')
> @@ -121,7 +121,7 @@ def smooth_fft(timefile, countfile, sample_hz, wlen):
>
>
> def usage():
> - print(("usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]"))
> + print("usage: "+argv[0]+" -t times-file -c counts-file [-s SAMPLING_HZ] [-w WINDOW_LEN] [-h]")
>
>
> if __name__=='__main__':
> diff --git a/testscripts/build/ltp-missing-install-files.py b/testscripts/build/ltp-missing-install-files.py
> index 11465a725..232028bd1 100755
> --- a/testscripts/build/ltp-missing-install-files.py
> +++ b/testscripts/build/ltp-missing-install-files.py
> @@ -111,6 +111,6 @@ for logfile in logfiles:
> fd.close()
>
> if len(missing_ents):
> - print(("\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents])))
> + print("\n".join(["%s: %s" % (os.path.basename(logfile), i) for i in ["Tag | App"] + missing_ents]))
> elif opts.verbose:
> - print(("%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile)))
> + print("%s: CONGRATULATIONS -- no missing files found!" % os.path.basename(logfile))
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [LTP] [PATCH v3] *.py : convert python2 to python3
2018-04-25 10:22 ` Xiao Yang
@ 2018-04-25 13:58 ` Petr Vorel
0 siblings, 0 replies; 12+ messages in thread
From: Petr Vorel @ 2018-04-25 13:58 UTC (permalink / raw)
To: ltp
Hi Xiao,
> Hi Petr,
> It seems that many distros still use python2 interpreter instead of python3 by default.
> Do you want to install python3 package forcely before testing python code in ltp?
Yes, LTP now depends optionally on Python3. Given short time for python2 [1], it didn't
make much sense to support both Python 2 & 3.
> Is it necessary to make sure all python3 code are compatible with python2 interpreter?
Current code is Python 3 compatible. Or have you find any issue?
Actually we've been thinking to remove all python from LTP because is not usually on
embedded Linux (well, Python can be cross-compiled for embedded [2], but 1) some devices
are still to slow to have it 2) it wouldn't be easy to install it on embedded device
yourself).
> Thanks,
> Xiao Yang
Kind regards,
Petr
[1] https://pythonclock.org/
[2] https://wiki.python.org/moin/EmbeddedPython
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2018-04-25 13:58 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-19 10:10 [LTP] [PATCH] *.py : convert python2 to python3 Yong Sun
2018-04-19 16:01 ` Cyril Hrubis
2018-04-20 10:09 ` Petr Vorel
2018-04-23 3:06 ` Yong Sun
2018-04-20 9:59 ` Petr Vorel
2018-04-20 10:00 ` Yong Sun
2018-04-23 3:32 ` [LTP] [PATCH v2] " Yong Sun
2018-04-23 6:55 ` Petr Vorel
2018-04-23 8:12 ` [LTP] [PATCH v3] " Yong Sun
2018-04-24 9:05 ` Petr Vorel
2018-04-25 10:22 ` Xiao Yang
2018-04-25 13:58 ` Petr Vorel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.