test-runner: catch exception on test file removal
James Prestwood
PATCH 1/2 test-runner: catch exception on test file removal
Without catching this can result in a fatal error, ending the test run.
--- tools/test-runner | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/test-runner +4 -1
@@ -1380,7 +1380,10 @@ def post_test(ctx, to_copy): allowed = ['phonesim.conf', 'certs', 'secrets', 'iwd'] for f in [f for f in os.listdir('/tmp') if f not in allowed]: dbg("File %s was not cleaned up!" % f) - os.remove('/tmp/' + f) + try: + os.remove('/tmp/' + f) + except: + pass def print_results(results): table = PrettyTable(['Test', colored('Passed', 'green'), colored('Failed', 'red'), \
Signature · 1 line
2.31.1
James Prestwood
PATCH 2/2 auto-t: iwd.py: fix namespaces on StationDebug
Passing the full argument list to StationDebug was removed because any existing properties (for Device) were being included and causing incorrect behavior.
This neglected to handle namespaces which should also be passed to StationDebug. Unfortunately the arguments are not named when Device() is initialized so they cannot easily be sorted. Instead just define Device() arguments to match the DBus abstraction and pass only the path and namespace to StationDebug
--- autotests/util/iwd.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
autotests/util/iwd.py +6 -3
@@ -280,14 +280,17 @@ class Device(IWDDBusAbstract): ''' _iface_name = IWD_DEVICE_INTERFACE - def __init__(self, *args, **kwargs): + def __init__(self, object_path = None, properties = None, + service=IWD_SERVICE, namespace=ctx): self._wps_manager_if = None self._station_if = None self._station_props = None - IWDDBusAbstract.__init__(self, *args, **kwargs) + IWDDBusAbstract.__init__(self, object_path, properties, service, + namespace) - self._station_debug = StationDebug(args[0]) + self._station_debug = StationDebug(object_path=object_path, + namespace=namespace) @property def _wps_manager(self):
Signature · 1 line
2.31.1
Denis Kenzior
Hi James,
Quoted 6 lines · James Prestwood
Without catching this can result in a fatal error, ending the test run.
--- tools/test-runner | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Both applied, thanks.
Regards,
-Denis