F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Replace deprecated optparse

Browse Source
This commit is contained in:
André Apitzsch
2023-02-01 17:48:12 +01:00
committed by Tom Henderson
parent 5cbd4b9c8f
commit 53ce443f79
2 changed files with 131 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

246
test.py
View File

@@ -19,7 +19,7 @@
import os
import sys
import time
import optparse
import argparse
import subprocess
import threading
import signal
@@ -623,7 +623,7 @@ def read_ns3_config():
if line.startswith(item):
exec(line, globals())
if options.verbose:
if args.verbose:
for item in interesting_config_items:
print("%s ==" % item, eval(item))
@@ -661,7 +661,7 @@ def make_paths():
else:
os.environ["PYTHONPATH"] += ":" + pypath
if options.verbose:
if args.verbose:
print("os.environ[\"PYTHONPATH\"] == %s" % os.environ["PYTHONPATH"])
if sys.platform == "darwin":
@@ -669,28 +669,28 @@ def make_paths():
os.environ["DYLD_LIBRARY_PATH"] = ""
for path in NS3_MODULE_PATH:
os.environ["DYLD_LIBRARY_PATH"] += ":" + path
if options.verbose:
if args.verbose:
print("os.environ[\"DYLD_LIBRARY_PATH\"] == %s" % os.environ["DYLD_LIBRARY_PATH"])
elif sys.platform == "win32":
if not have_PATH:
os.environ["PATH"] = ""
for path in NS3_MODULE_PATH:
os.environ["PATH"] += ';' + path
if options.verbose:
if args.verbose:
print("os.environ[\"PATH\"] == %s" % os.environ["PATH"])
elif sys.platform == "cygwin":
if not have_PATH:
os.environ["PATH"] = ""
for path in NS3_MODULE_PATH:
os.environ["PATH"] += ":" + path
if options.verbose:
if args.verbose:
print("os.environ[\"PATH\"] == %s" % os.environ["PATH"])
else:
if not have_LD_LIBRARY_PATH:
os.environ["LD_LIBRARY_PATH"] = ""
for path in NS3_MODULE_PATH:
os.environ["LD_LIBRARY_PATH"] += ":" + str(path)
if options.verbose:
if args.verbose:
print("os.environ[\"LD_LIBRARY_PATH\"] == %s" % os.environ["LD_LIBRARY_PATH"])
#
@@ -801,7 +801,7 @@ def run_job_synchronously(shell_command, directory, valgrind, is_python, build_p
else:
cmd = path_cmd
if options.verbose:
if args.verbose:
print("Synchronously execute %s" % cmd)
start_time = time.time()
@@ -833,7 +833,7 @@ def run_job_synchronously(shell_command, directory, valgrind, is_python, build_p
stdout_results = decode_stream_results(stdout_results, "stdout")
stderr_results = decode_stream_results(stderr_results, "stderr")
if options.verbose:
if args.verbose:
print("Return code = ", retval)
print("stderr = ", stderr_results)
@@ -1009,7 +1009,7 @@ class worker_thread(threading.Thread):
# if is_skip is true, returncode is undefined.
#
if job.is_skip:
if options.verbose:
if args.verbose:
print("Skip %s" % job.shell_command)
self.output_queue.put(job)
continue
@@ -1018,7 +1018,7 @@ class worker_thread(threading.Thread):
# Otherwise go about the business of running tests as normal.
#
else:
if options.verbose:
if args.verbose:
print("Launch %s" % job.shell_command)
if job.is_example or job.is_pyexample:
@@ -1028,24 +1028,24 @@ class worker_thread(threading.Thread):
# "examples/wireless/mixed-wireless.py"
#
(job.returncode, standard_out, standard_err, et) = run_job_synchronously(job.shell_command,
job.cwd, options.valgrind, job.is_pyexample, job.build_path)
job.cwd, args.valgrind, job.is_pyexample, job.build_path)
else:
#
# If we're a test suite, we need to provide a little more info
# to the test runner, specifically the base directory and temp
# file name
#
if options.update_data:
if args.update_data:
update_data = '--update-data'
else:
update_data = ''
(job.returncode, standard_out, standard_err, et) = run_job_synchronously(job.shell_command +
" --xml --tempdir=%s --out=%s %s" % (job.tempdir, job.tmp_file_name, update_data),
job.cwd, options.valgrind, False)
job.cwd, args.valgrind, False)
job.set_elapsed_time(et)
if options.verbose:
if args.verbose:
print("returncode = %d" % job.returncode)
print("---------- begin standard out ----------")
print(standard_out)
@@ -1090,7 +1090,7 @@ def run_tests():
# our users pain while waiting for extraneous stuff to compile and link, so
# we allow users that know what they're doing to not invoke ns3 at all.
#
if not options.no_build:
if not args.no_build:
# If the user only wants to run a single example, then we can just build
# that example.
@@ -1098,15 +1098,15 @@ def run_tests():
# If there is no constraint, then we have to build everything since the
# user wants to run everything.
#
if len(options.example):
build_cmd = "./ns3 build %s" % os.path.basename(options.example)
if len(args.example):
build_cmd = "./ns3 build %s" % os.path.basename(args.example)
else:
build_cmd = "./ns3"
if sys.platform == "win32":
build_cmd = sys.executable + " " + build_cmd
if options.verbose:
if args.verbose:
print("Building: %s" % build_cmd)
proc = subprocess.run(build_cmd, shell=True)
@@ -1216,16 +1216,16 @@ def run_tests():
# up a bunch of threads and running tests. Let's detect these cases and
# handle them without doing all of the hard work.
#
if options.kinds:
if args.kinds:
path_cmd = os.path.join("utils", test_runner_name + " --print-test-type-list")
(rc, standard_out, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False)
print(standard_out)
if options.list:
if args.list:
list_items = []
if ENABLE_TESTS:
if len(options.constrain):
path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list --print-test-types --test-type=%s" % options.constrain)
if len(args.constrain):
path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list --print-test-types --test-type=%s" % args.constrain)
else:
path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list --print-test-types")
(rc, standard_out, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False)
@@ -1258,7 +1258,7 @@ def run_tests():
print("example ", item)
print()
if options.kinds or options.list:
if args.kinds or args.list:
return
#
@@ -1326,7 +1326,7 @@ def run_tests():
# Flag indicating a specific suite was explicitly requested
single_suite = False
if len(options.suite):
if len(args.suite):
# See if this is a valid test suite.
path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list")
(rc, suites, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False)
@@ -1334,7 +1334,7 @@ def run_tests():
if isinstance(suites, bytes):
suites = suites.decode()
suites_found = fnmatch.filter(suites.split('\n'), options.suite)
suites_found = fnmatch.filter(suites.split('\n'), args.suite)
if not suites_found:
print('The test suite was not run because an unknown test suite name was requested.', file=sys.stderr)
@@ -1344,9 +1344,9 @@ def run_tests():
suites = '\n'.join(suites_found)
elif ENABLE_TESTS and len(options.example) == 0 and len(options.pyexample) == 0:
if len(options.constrain):
path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list --test-type=%s" % options.constrain)
elif ENABLE_TESTS and len(args.example) == 0 and len(args.pyexample) == 0:
if len(args.constrain):
path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list --test-type=%s" % args.constrain)
(rc, suites, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False)
else:
path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list")
@@ -1371,7 +1371,7 @@ def run_tests():
# i.e. they are not run by default in test.py.
# If a specific suite was requested we run it, even if
# it is a performance test.
if not single_suite and options.constrain != 'performance':
if not single_suite and args.constrain != 'performance':
# Get a list of all of the performance tests.
path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list --test-type=%s" % "performance")
@@ -1414,11 +1414,11 @@ def run_tests():
else:
processors = os.cpu_count()
if (options.process_limit):
if (processors < options.process_limit):
if args.process_limit:
if processors < args.process_limit:
print('Using all %s processors' % processors)
else:
processors = options.process_limit
processors = args.process_limit
print('Limiting to %s worker processes' % processors)
#
@@ -1458,12 +1458,12 @@ def run_tests():
job.set_cwd(os.getcwd())
job.set_basedir(os.getcwd())
job.set_tempdir(testpy_output_dir)
if (options.multiple):
if args.multiple:
multiple = ""
else:
multiple = " --stop-on-failure"
if (len(options.fullness)):
fullness = options.fullness.upper()
if len(args.fullness):
fullness = args.fullness.upper()
fullness = " --fullness=%s" % fullness
else:
fullness = " --fullness=QUICK"
@@ -1472,11 +1472,11 @@ def run_tests():
job.set_shell_command(path_cmd)
if options.valgrind and test in core_valgrind_skip_tests:
if args.valgrind and test in core_valgrind_skip_tests:
job.set_is_skip(True)
job.set_skip_reason("crashes valgrind")
if options.verbose:
if args.verbose:
print("Queue %s" % test)
input_queue.put(job)
@@ -1515,8 +1515,8 @@ def run_tests():
# ./test.py --suite=some-suite --example=some-example: run the single example
#
#
if len(options.suite) == 0 and len(options.example) == 0 and len(options.pyexample) == 0:
if len(options.constrain) == 0 or options.constrain == "example":
if len(args.suite) == 0 and len(args.example) == 0 and len(args.pyexample) == 0:
if len(args.constrain) == 0 or args.constrain == "example":
if ENABLE_EXAMPLES:
for name, test, do_run, do_valgrind_run in example_tests:
# Remove any arguments and directory names from test.
@@ -1536,23 +1536,23 @@ def run_tests():
job.set_basedir(os.getcwd())
job.set_tempdir(testpy_output_dir)
job.set_shell_command(test)
job.set_build_path(options.buildpath)
job.set_build_path(args.buildpath)
if options.valgrind and not eval(do_valgrind_run):
if args.valgrind and not eval(do_valgrind_run):
job.set_is_skip(True)
job.set_skip_reason("skip in valgrind runs")
if options.verbose:
if args.verbose:
print("Queue %s" % test)
input_queue.put(job)
jobs = jobs + 1
total_tests = total_tests + 1
elif len(options.example):
elif len(args.example):
# Add the proper prefix and suffix to the example name to
# match what is done in the CMakeLists.txt file.
example_name = "%s%s-%s%s" % (APPNAME, VERSION, options.example, BUILD_PROFILE_SUFFIX)
example_name = "%s%s-%s%s" % (APPNAME, VERSION, args.example, BUILD_PROFILE_SUFFIX)
key_list = []
for key in ns3_runnable_programs_dictionary:
@@ -1560,7 +1560,7 @@ def run_tests():
example_name_key_list = fnmatch.filter(key_list, example_name)
if len(example_name_key_list) == 0:
print("No example matching the name %s" % options.example)
print("No example matching the name %s" % args.example)
else:
#
# If you tell me to run an example, I will try and run the example
@@ -1578,9 +1578,9 @@ def run_tests():
job.set_basedir(os.getcwd())
job.set_tempdir(testpy_output_dir)
job.set_shell_command(example_path)
job.set_build_path(options.buildpath)
job.set_build_path(args.buildpath)
if options.verbose:
if args.verbose:
print("Queue %s" % example_name_iter)
input_queue.put(job)
@@ -1607,8 +1607,8 @@ def run_tests():
# ./test.py --constrain=pyexample run all of the python examples
# ./test.py --pyexample=some-example.py: run the single python example
#
if len(options.suite) == 0 and len(options.example) == 0 and len(options.pyexample) == 0:
if len(options.constrain) == 0 or options.constrain == "pyexample":
if len(args.suite) == 0 and len(args.example) == 0 and len(args.pyexample) == 0:
if len(args.constrain) == 0 or args.constrain == "pyexample":
for test, do_run in python_tests:
# Remove any arguments and directory names from test.
test_name = test.split(' ', 1)[0]
@@ -1635,7 +1635,7 @@ def run_tests():
# work to report the skipped tests in a consistent
# way through the output formatter.
#
if options.valgrind:
if args.valgrind:
job.set_is_skip(True)
job.set_skip_reason("skip in valgrind runs")
@@ -1648,26 +1648,26 @@ def run_tests():
job.set_is_skip(True)
job.set_skip_reason("requires Python bindings")
if options.verbose:
if args.verbose:
print("Queue %s" % test)
input_queue.put(job)
jobs = jobs + 1
total_tests = total_tests + 1
elif len(options.pyexample):
elif len(args.pyexample):
# Find the full relative path to file if only a partial path has been given.
if not os.path.exists(options.pyexample):
if not os.path.exists(args.pyexample):
import glob
files = glob.glob("./**/%s" % options.pyexample, recursive=True)
files = glob.glob("./**/%s" % args.pyexample, recursive=True)
if files:
options.pyexample = files[0]
args.pyexample = files[0]
# Don't try to run this example if it isn't runnable.
example_name = os.path.basename(options.pyexample)
example_name = os.path.basename(args.pyexample)
if example_name not in ns3_runnable_scripts:
print("Example %s is not runnable." % example_name)
elif not os.path.exists(options.pyexample):
elif not os.path.exists(args.pyexample):
print("Example %s does not exist." % example_name)
else:
#
@@ -1676,16 +1676,16 @@ def run_tests():
#
job = Job()
job.set_is_pyexample(True)
job.set_display_name(options.pyexample)
job.set_display_name(args.pyexample)
job.set_tmp_file_name("")
job.set_cwd(testpy_output_dir)
job.set_basedir(os.getcwd())
job.set_tempdir(testpy_output_dir)
job.set_shell_command(options.pyexample)
job.set_shell_command(args.pyexample)
job.set_build_path("")
if options.verbose:
print("Queue %s" % options.pyexample)
if args.verbose:
print("Queue %s" % args.pyexample)
input_queue.put(job)
jobs = jobs + 1
@@ -1754,7 +1754,7 @@ def run_tests():
status_print = colors.PINK + status + colors.NORMAL
print("[%d/%d]" % (passed_tests + failed_tests + skipped_tests + crashed_tests, total_tests), end=' ')
if options.duration or options.constrain == "performance":
if args.duration or args.constrain == "performance":
print("%s (%.3f): %s %s" % (status_print, job.elapsed_time, kind, job.display_name))
else:
print("%s: %s %s" % (status_print, kind, job.display_name))
@@ -1892,17 +1892,17 @@ def run_tests():
# The last things to do are to translate the XML results file to "human
# readable form" if the user asked for it (or make an XML file somewhere)
#
if len(options.html) + len(options.text) + len(options.xml):
if len(args.html) + len(args.text) + len(args.xml):
print()
if len(options.html):
translate_to_html(xml_results_file, options.html)
if len(args.html):
translate_to_html(xml_results_file, args.html)
if len(options.text):
translate_to_text(xml_results_file, options.text)
if len(args.text):
translate_to_text(xml_results_file, args.text)
if len(options.xml):
xml_file = options.xml + '.xml'
if len(args.xml):
xml_file = args.xml + '.xml'
print('Writing results to xml file %s...' % xml_file, end='')
shutil.copyfile(xml_results_file, xml_file)
print('done.')
@@ -1925,7 +1925,7 @@ def run_tests():
# Let the user know if they tried to use valgrind but it was not
# present on their machine.
#
if options.valgrind and not VALGRIND_FOUND:
if args.valgrind and not VALGRIND_FOUND:
print()
print('*** Note: you are trying to use valgrind, but valgrind could not be found')
print('*** on your machine. All tests and examples will crash or be skipped.')
@@ -1937,7 +1937,7 @@ def run_tests():
# directory we just created. We don't want to happily delete any retained
# directories, which will probably surprise the user.
#
if not options.retain:
if not args.retain:
shutil.rmtree(testpy_output_dir)
if passed_tests + skipped_tests == total_tests:
@@ -1946,83 +1946,79 @@ def run_tests():
return 1 # catchall for general errors
def main(argv):
parser = optparse.OptionParser()
parser.add_option("-b", "--buildpath", action="store", type="string", dest="buildpath", default="",
metavar="BUILDPATH",
help="specify the path where ns-3 was built (defaults to the build directory for the current variant)")
parser = argparse.ArgumentParser()
parser.add_argument("-b", "--buildpath", action="store", type=str, default="",
help="specify the path where ns-3 was built (defaults to the build directory for the current variant)")
parser.add_option("-c", "--constrain", action="store", type="string", dest="constrain", default="",
metavar="KIND",
help="constrain the test-runner by kind of test")
parser.add_argument("-c", "--constrain", action="store", type=str, default="",
help="constrain the test-runner by kind of test")
parser.add_option("-d", "--duration", action="store_true", dest="duration", default=False,
help="print the duration of each test suite and example")
parser.add_argument("-d", "--duration", action="store_true", default=False,
help="print the duration of each test suite and example")
parser.add_option("-e", "--example", action="store", type="string", dest="example", default="",
metavar="EXAMPLE",
help="specify a single example to run (no relative path is needed)")
parser.add_argument("-e", "--example", action="store", type=str, default="",
help="specify a single example to run (no relative path is needed)")
parser.add_option("-u", "--update-data", action="store_true", dest="update_data", default=False,
help="If examples use reference data files, get them to re-generate them")
parser.add_argument("-u", "--update-data", action="store_true", default=False,
help="If examples use reference data files, get them to re-generate them")
parser.add_option("-f", "--fullness", action="store", type="choice", dest="fullness", default="QUICK",
metavar="FULLNESS", choices=["QUICK", "EXTENSIVE", "TAKES_FOREVER"],
help="choose the duration of tests to run: QUICK, EXTENSIVE, or TAKES_FOREVER, where EXTENSIVE includes QUICK and TAKES_FOREVER includes QUICK and EXTENSIVE (only QUICK tests are run by default)")
parser.add_argument("-f", "--fullness", action="store", type=str, default="QUICK",
choices=["QUICK", "EXTENSIVE", "TAKES_FOREVER"],
help="choose the duration of tests to run: QUICK, EXTENSIVE, or TAKES_FOREVER, where EXTENSIVE includes QUICK and TAKES_FOREVER includes QUICK and EXTENSIVE (only QUICK tests are run by default)")
parser.add_option("-g", "--grind", action="store_true", dest="valgrind", default=False,
help="run the test suites and examples using valgrind")
parser.add_argument("-g", "--grind", action="store_true", dest="valgrind", default=False,
help="run the test suites and examples using valgrind")
parser.add_option("-k", "--kinds", action="store_true", dest="kinds", default=False,
help="print the kinds of tests available")
parser.add_argument("-k", "--kinds", action="store_true", default=False,
help="print the kinds of tests available")
parser.add_option("-l", "--list", action="store_true", dest="list", default=False,
help="print the list of known tests")
parser.add_argument("-l", "--list", action="store_true", default=False,
help="print the list of known tests")
parser.add_option("-m", "--multiple", action="store_true", dest="multiple", default=False,
help="report multiple failures from test suites and test cases")
parser.add_argument("-m", "--multiple", action="store_true", default=False,
help="report multiple failures from test suites and test cases")
parser.add_option("-n", "--no-build", action="store_true", dest="no_build", default=False,
help="do not build before starting testing")
parser.add_argument("-n", "--no-build", action="store_true", default=False,
help="do not build before starting testing")
parser.add_option("-p", "--pyexample", action="store", type="string", dest="pyexample", default="",
metavar="PYEXAMPLE",
help="specify a single python example to run (with relative path)")
parser.add_argument("-p", "--pyexample", action="store", type=str, default="",
help="specify a single python example to run (with relative path)")
parser.add_option("-r", "--retain", action="store_true", dest="retain", default=False,
help="retain all temporary files (which are normally deleted)")
parser.add_argument("-r", "--retain", action="store_true", default=False,
help="retain all temporary files (which are normally deleted)")
parser.add_option("-s", "--suite", action="store", type="string", dest="suite", default="",
metavar="TEST-SUITE",
help="specify a single test suite to run")
parser.add_argument("-s", "--suite", action="store", type=str, default="",
help="specify a single test suite to run")
parser.add_option("-t", "--text", action="store", type="string", dest="text", default="",
metavar="TEXT-FILE",
help="write detailed test results into TEXT-FILE.txt")
parser.add_argument("-t", "--text", action="store", type=str, default="",
metavar="TEXT-FILE",
help="write detailed test results into TEXT-FILE.txt")
parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
help="print progress and informational messages")
parser.add_argument("-v", "--verbose", action="store_true", default=False,
help="print progress and informational messages")
parser.add_option("-w", "--web", "--html", action="store", type="string", dest="html", default="",
metavar="HTML-FILE",
help="write detailed test results into HTML-FILE.html")
parser.add_argument("-w", "--web", "--html", action="store", type=str, dest="html", default="",
metavar="HTML-FILE",
help="write detailed test results into HTML-FILE.html")
parser.add_option("-x", "--xml", action="store", type="string", dest="xml", default="",
metavar="XML-FILE",
help="write detailed test results into XML-FILE.xml")
parser.add_argument("-x", "--xml", action="store", type=str, default="",
metavar="XML-FILE",
help="write detailed test results into XML-FILE.xml")
parser.add_option("--nocolor", action="store_true", dest="nocolor", default=False,
help="do not use colors in the standard output")
parser.add_option("--jobs", action="store", type="int", dest="process_limit", default=0,
help="limit number of worker threads")
parser.add_argument("--nocolor", action="store_true", default=False,
help="do not use colors in the standard output")
global options
options = parser.parse_args()[0]
parser.add_argument("--jobs", action="store", type=int, dest="process_limit", default=0,
help="limit number of worker threads")
global args
args = parser.parse_args()
signal.signal(signal.SIGINT, sigint_hook)
# From waf/waflib/Options.py
envcolor=os.environ.get('NOCOLOR','') and 'no' or 'auto' or 'yes'
if options.nocolor or envcolor == 'no':
if args.nocolor or envcolor == 'no':
colors_lst['USE'] = False
return run_tests()