tests: Split run-tests.py logger info into per test case files

The run-tests.py -l argument does not take an argument value anymore.
Instead, debug output is directed to a separate file <test>.log for each
test case.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/tests/hwsim/README b/tests/hwsim/README
index dd4dcae1791d5bc5e73fa4dd08248aabf3f3acd6..42884831f30469cf94aa5a1ff1da82d1acf64304 100644 (file)
--- a/tests/hwsim/README
+++ b/tests/hwsim/README
@@ -141,7 +141,7 @@ timestamp and a postfix to identify the specific log:
 - hwsim0 = wlantest debug log
 - hwsim0.pcapng = capture with all frames exchanged during the tests
 - tcpdump = tcpdump output
-- run = debug prints from the test scripts
+- *.log = debug prints from the test scripts
 - trace.dat = Linux tracing record (if enabled)
 - hlr_auc_gw - hlr_auc_gw (EAP-SIM/AKA/AKA' authentication) log
 - auth_serv - hostapd as RADIUS authentication server log

diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py
index 7d6e7b143c9c3909ebb5479020466bf07732a51a..161a34c361e1fc7b059aa59b1f85de7056966459 100644 (file)
--- a/tests/hwsim/hostapd.py
+++ b/tests/hwsim/hostapd.py
@@ -11,7 +11,7 @@ import time
 import logging
 import wpaspy
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 hapd_ctrl = '/var/run/hostapd'
 hapd_global = '/var/run/hostapd-global'
 

diff --git a/tests/hwsim/hwsim_utils.py b/tests/hwsim/hwsim_utils.py
index 365fbb25722000894f894344ac9af596d64ed4b8..42856fe9ee4b4a5e6101042787817f9b2e011708 100644 (file)
--- a/tests/hwsim/hwsim_utils.py
+++ b/tests/hwsim/hwsim_utils.py
@@ -9,7 +9,7 @@
 import os
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 def test_connectivity(ifname1, ifname2):
     if os.path.isfile("../../mac80211_hwsim/tools/hwsim_test"):

diff --git a/tests/hwsim/run-all.sh b/tests/hwsim/run-all.sh
index 126380e6271c646639d728465d45c38571169b4a..9a33c32528c66e2506064f3ce10f89ed9ce3c015 100755 (executable)
--- a/tests/hwsim/run-all.sh
+++ b/tests/hwsim/run-all.sh
@@ -63,7 +63,7 @@ if ! ./start.sh $CONCURRENT $VALGRIND $TRACE; then
        exit 1
 fi
 
-./run-tests.py -D --logdir "$LOGDIR" $TRACE_ARGS -l run $DB -e failed -r results.txt $CONCURRENT_TESTS $@ || errors=1
+./run-tests.py -D --logdir "$LOGDIR" $TRACE_ARGS -l $DB -e failed -r results.txt $CONCURRENT_TESTS $@ || errors=1
 
 ./stop-wifi.sh
 

diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py
index 9908dc569af1fe4f7522dcee7e39d5ec8825ed45..536456eb5889c75c468252440844d3df123d9366 100755 (executable)
--- a/tests/hwsim/run-tests.py
+++ b/tests/hwsim/run-tests.py
@@ -15,7 +15,7 @@ import argparse
 import subprocess
 
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 sys.path.append('../../wpaspy')
 
@@ -101,8 +101,8 @@ def main():
                        help="verbose debug output")
     group.add_argument('-q', const=logging.WARNING, action='store_const',
                        dest='loglevel', help="be quiet")
-    group.add_argument('-l', metavar='<filename>', dest='logfile',
-                       help='debug log filename (in log directory)')
+    group.add_argument('-l', action='store_true', dest='logfile',
+                       help='store debug log to a file (in log directory)')
 
     parser.add_argument('-e', metavar="<filename>", dest='errorfile',
                         nargs='?', const="failed",
@@ -142,11 +142,17 @@ def main():
             sys.exit(2)
 
     if args.logfile:
-        logging.basicConfig(filename=os.path.join(args.logdir, args.logfile),
-                            level=logging.DEBUG)
+        logger.setLevel(logging.DEBUG)
+        file_name = os.path.join(args.logdir, 'run-tests.log')
+        log_handler = logging.FileHandler(file_name)
+        fmt = "%(asctime)s %(levelname)s %(message)s"
+        log_formatter = logging.Formatter(fmt)
+        log_handler.setFormatter(log_formatter)
+        logger.addHandler(log_handler)
         log_to_file = True
     else:
         logging.basicConfig(level=args.loglevel)
+        log_handler = None
         log_to_file = False
         if args.loglevel == logging.WARNING:
             print_res = True
@@ -216,6 +222,15 @@ def main():
         if args.testmodules:
             if not t.__module__.replace('test_', '', 1) in args.testmodules:
                 continue
+
+        if log_handler:
+            log_handler.stream.close()
+            logger.removeHandler(log_handler)
+            file_name = os.path.join(args.logdir, name + '.log')
+            log_handler = logging.FileHandler(file_name)
+            log_handler.setFormatter(log_formatter)
+            logger.addHandler(log_handler)
+
         with DataCollector(args.logdir, name, args.tracing, args.dmesg):
             logger.info("START " + name)
             if log_to_file:
@@ -282,6 +297,14 @@ def main():
                     logger.info(e)
             reset_devs(dev, apdev)
 
+    if log_handler:
+        log_handler.stream.close()
+        logger.removeHandler(log_handler)
+        file_name = os.path.join(args.logdir, 'run-tests.log')
+        log_handler = logging.FileHandler(file_name)
+        log_handler.setFormatter(log_formatter)
+        logger.addHandler(log_handler)
+
     if conn:
         conn.close()
 

diff --git a/tests/hwsim/test_ap_dynamic.py b/tests/hwsim/test_ap_dynamic.py
index 49b88ca8f80dddd524d0298a082ee5d53e97652f..515aae05c9002de18f1cf32597c5c58aaf1a189b 100644 (file)
--- a/tests/hwsim/test_ap_dynamic.py
+++ b/tests/hwsim/test_ap_dynamic.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 import hostapd

diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py
index cf6c982f5909026e0ef3909b4f91aac28a93640d..3ada012149eafcf881bae4114dd8bca66e3290b2 100644 (file)
--- a/tests/hwsim/test_ap_eap.py
+++ b/tests/hwsim/test_ap_eap.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 import os.path
 
 import hwsim_utils

diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py
index c206bcf108966923e8df4e5f33b4e79eea3b2e6c..c78ad3515a2650975bae757fca0265a9aac66e79 100644 (file)
--- a/tests/hwsim/test_ap_ft.py
+++ b/tests/hwsim/test_ap_ft.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 import hostapd

diff --git a/tests/hwsim/test_ap_hs20.py b/tests/hwsim/test_ap_hs20.py
index 60ec1a719422f55a25460c66ef8c835de0699501..cb9ee1fe2873dcde8aeb52f6d7f3e8e5498724a3 100644 (file)
--- a/tests/hwsim/test_ap_hs20.py
+++ b/tests/hwsim/test_ap_hs20.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 import os.path
 import subprocess
 

diff --git a/tests/hwsim/test_ap_pmf.py b/tests/hwsim/test_ap_pmf.py
index 33e023b577adb0b77dfce41a990bd9ec1f875db1..4645d445d9e66027202273527dcff1dc6b85cffe 100644 (file)
--- a/tests/hwsim/test_ap_pmf.py
+++ b/tests/hwsim/test_ap_pmf.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 import hostapd

diff --git a/tests/hwsim/test_ap_roam.py b/tests/hwsim/test_ap_roam.py
index 3a966f7fc1a9d01f6177de037c4bc0a271c9b38d..a9d671ccd1d56e901e9025628644e7d68cd03f99 100644 (file)
--- a/tests/hwsim/test_ap_roam.py
+++ b/tests/hwsim/test_ap_roam.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 import hostapd

diff --git a/tests/hwsim/test_ap_tdls.py b/tests/hwsim/test_ap_tdls.py
index b906a2be9b4b4472281be2442252859f8d99a6fb..5c2b2efad07b0c08f7d64bd4551dd11b890852c7 100644 (file)
--- a/tests/hwsim/test_ap_tdls.py
+++ b/tests/hwsim/test_ap_tdls.py
@@ -8,7 +8,7 @@
 
 import time
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 from hostapd import HostapdGlobal

diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py
index 0587e4c15bdfc4d06110e29dcc8dd21b24a00bf8..486dd206e1dde098e97332f631718a191470789b 100644 (file)
--- a/tests/hwsim/test_ap_wps.py
+++ b/tests/hwsim/test_ap_wps.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 import hostapd

diff --git a/tests/hwsim/test_gas.py b/tests/hwsim/test_gas.py
index 5078fe1935442123df4cdd795608fde723ead691..33ee72122890e55e6bb6b64f33019f16b7841c50 100644 (file)
--- a/tests/hwsim/test_gas.py
+++ b/tests/hwsim/test_gas.py
@@ -8,7 +8,7 @@
 
 import time
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 import re
 
 import hostapd

diff --git a/tests/hwsim/test_ibss.py b/tests/hwsim/test_ibss.py
index c0f614e5902fb7a96befc985465595cce6fdbd31..5d9e20ad79348c06e5546a95bf62da0405259c74 100644 (file)
--- a/tests/hwsim/test_ibss.py
+++ b/tests/hwsim/test_ibss.py
@@ -7,7 +7,7 @@
 # See README for more details.
 
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 import time
 import re
 

diff --git a/tests/hwsim/test_nfc_wps.py b/tests/hwsim/test_nfc_wps.py
index 275212b24612f77da6b80186bd9c7241afed95cc..eab6d1a9d6505dfd3ae31f7bc93f10665bd93050 100644 (file)
--- a/tests/hwsim/test_nfc_wps.py
+++ b/tests/hwsim/test_nfc_wps.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 import hostapd

diff --git a/tests/hwsim/test_p2p_autogo.py b/tests/hwsim/test_p2p_autogo.py
index 507e74e6dd0a1cff4741baf7014794511aa3a950..d90797b0b740b23574637e144ef4f6f10ab19204 100644 (file)
--- a/tests/hwsim/test_p2p_autogo.py
+++ b/tests/hwsim/test_p2p_autogo.py
@@ -9,7 +9,7 @@
 import time
 import subprocess
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 from wlantest import Wlantest

diff --git a/tests/hwsim/test_p2p_discovery.py b/tests/hwsim/test_p2p_discovery.py
index f1029c82cbcffe1f2056afbe006e78e1805c567e..84bd36ed556f2eee219d6c2471b0abf9ec1db0d3 100644 (file)
--- a/tests/hwsim/test_p2p_discovery.py
+++ b/tests/hwsim/test_p2p_discovery.py
@@ -7,7 +7,7 @@
 # See README for more details.
 
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 

diff --git a/tests/hwsim/test_p2p_grpform.py b/tests/hwsim/test_p2p_grpform.py
index 90844c736bbf1d4e299449e59bf4638cb054b63f..8df6e33e1d5537dac2388bff0c478e60fbc8cff9 100644 (file)
--- a/tests/hwsim/test_p2p_grpform.py
+++ b/tests/hwsim/test_p2p_grpform.py
@@ -7,7 +7,7 @@
 # See README for more details.
 
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 import time
 import threading
 import Queue

diff --git a/tests/hwsim/test_p2p_invitation.py b/tests/hwsim/test_p2p_invitation.py
index 7d53a1af8a614dc0a986d56f12079a646ca1b254..db8441ea3f442ed015122c75bb03834d4f87afe1 100644 (file)
--- a/tests/hwsim/test_p2p_invitation.py
+++ b/tests/hwsim/test_p2p_invitation.py
@@ -7,7 +7,7 @@
 # See README for more details.
 
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 

diff --git a/tests/hwsim/test_p2p_persistent.py b/tests/hwsim/test_p2p_persistent.py
index 7f166b207b58ef03ab97eec175896c209e973fb3..a4be1812abf6b7cc71084d9a374a5d1d68abf1fa 100644 (file)
--- a/tests/hwsim/test_p2p_persistent.py
+++ b/tests/hwsim/test_p2p_persistent.py
@@ -7,7 +7,7 @@
 # See README for more details.
 
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 

diff --git a/tests/hwsim/test_p2p_service.py b/tests/hwsim/test_p2p_service.py
index 5a412879d263e2711c94883c9ffbd222d4d4e54f..7ac4a149fc9138cbe22edf6143fdda728684c827 100644 (file)
--- a/tests/hwsim/test_p2p_service.py
+++ b/tests/hwsim/test_p2p_service.py
@@ -7,7 +7,7 @@
 # See README for more details.
 
 import logging
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 import hwsim_utils
 

diff --git a/tests/hwsim/wlantest.py b/tests/hwsim/wlantest.py
index c39320eb6b7ba1735350191beba55a294f7c76b9..d9dc5cefe38d6d30b239c3de7f717489c227d192 100644 (file)
--- a/tests/hwsim/wlantest.py
+++ b/tests/hwsim/wlantest.py
@@ -12,7 +12,7 @@ import subprocess
 import logging
 import wpaspy
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 class Wlantest:
     def __init__(self):

diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py
index 00d5f953ab015c4947e675235904179d850bbe8b..8986f2f0a94a94839cb38f2ee11d545220281e92 100644 (file)
--- a/tests/hwsim/wpasupplicant.py
+++ b/tests/hwsim/wpasupplicant.py
@@ -13,7 +13,7 @@ import re
 import subprocess
 import wpaspy
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 wpas_ctrl = '/var/run/wpa_supplicant'
 
 class WpaSupplicant: