jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Remove the 'test_' prefix from test module names

Browse source 
This is unnecessary extra complexity for user, so use the 'test_' prefix
only internally within the python scripts and file names.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-10-31 11:47:43 +02:00 committed by Jouni Malinen
parent 4cd8343f4d
commit e955226208
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/hwsim/README
View file

@ -151,10 +151,10 @@ For manual testing, ./start.sh can be used to initialize interfaces and
programs and run-tests.py to execute one or more test programs and run-tests.py to execute one or more test
cases. run-tests.py output verbosity can be controlled with -d (more cases. run-tests.py output verbosity can be controlled with -d (more
verbose debug output) and -q (less verbose output) on the command verbose debug output) and -q (less verbose output) on the command
line. "-f <test_filename(without.py)>" can be used to specify that all line. "-f <module name>" (pointing to file test_<module name>.py) can be
test cases from a single file are to be run. Test name as the last used to specify that all test cases from a single file are to be
command line argument can be specified that a single test case is to be run. Test name as the last command line argument can be specified that a
run (e.g., "./run-tests.py ap_pmf_required"). single test case is to be run (e.g., "./run-tests.py ap_pmf_required").
Adding/modifying test cases Adding/modifying test cases

4
tests/hwsim/run-all.sh
View file

@ -24,12 +24,12 @@ fi
if [ "x$1" = "xconcurrent-valgrind" ]; then if [ "x$1" = "xconcurrent-valgrind" ]; then
VALGRIND=valgrind VALGRIND=valgrind
CONCURRENT=concurrent CONCURRENT=concurrent
CONCURRENT_TESTS="-f test_p2p_autogo test_p2p_discovery test_p2p_grpform" CONCURRENT_TESTS="-f p2p_autogo p2p_discovery p2p_grpform"
SUFFIX=-concurrent-valgrind SUFFIX=-concurrent-valgrind
shift shift
elif [ "x$1" = "xconcurrent" ]; then elif [ "x$1" = "xconcurrent" ]; then
CONCURRENT=concurrent CONCURRENT=concurrent
CONCURRENT_TESTS="-f test_p2p_autogo test_p2p_discovery test_p2p_grpform" CONCURRENT_TESTS="-f p2p_autogo p2p_discovery p2p_grpform"
unset VALGRIND unset VALGRIND
SUFFIX=-concurrent SUFFIX=-concurrent
shift shift

4
tests/hwsim/run-tests.py
View file

@ -81,7 +81,7 @@ def main():
if m: if m:
logger.debug("Import test cases from " + t) logger.debug("Import test cases from " + t)
mod = __import__(m.group(1)) mod = __import__(m.group(1))
test_modules.append(mod.__name__) test_modules.append(mod.__name__.replace('test_', '', 1))
for s in dir(mod): for s in dir(mod):
if s.startswith("test_"): if s.startswith("test_"):
func = mod.__dict__.get(s) func = mod.__dict__.get(s)
@ -214,7 +214,7 @@ def main():
if not name in args.tests: if not name in args.tests:
continue continue
if args.testmodules: if args.testmodules:
if not t.__module__ in args.testmodules: if not t.__module__.replace('test_', '', 1) in args.testmodules:
continue continue
with DataCollector(args.logdir, name, args.tracing, args.dmesg): with DataCollector(args.logdir, name, args.tracing, args.dmesg):
logger.info("START " + name) logger.info("START " + name)