diff --git a/apertis_tests_lib/bluez.py b/apertis_tests_lib/bluez.py index 0631293f2a157194cbfdae19cbcba7004944a5b2..bf318e35e2cc24e181b0acfa94fd85c661a33239 100644 --- a/apertis_tests_lib/bluez.py +++ b/apertis_tests_lib/bluez.py @@ -305,7 +305,7 @@ def object_wait_for_properties_blocking(obj, properties_interface, properties, main_loop.run() -def adapters_ensure_powered(adapters, result_func): +def adapters_ensure_powered(adapters, result_func=None): assert(len(adapters) > 0) remaining = set(adapters) @@ -314,7 +314,7 @@ def adapters_ensure_powered(adapters, result_func): print('Adapter ‘%s’ is powered' % obj.object_path) remaining.remove(obj) - if len(remaining) == 0: + if not remaining and result_func: result_func() for adapter in adapters: @@ -336,10 +336,11 @@ def adapters_make_pairable(adapters, result_func=None): if not remaining and result_func: result_func() + adapters_ensure_powered(adapters) + for adapter in adapters: print('Making adapter ‘%s’ pairable…' % adapter.object_path) object_set_properties(adapter, 'org.bluez.Adapter1', { - 'Powered': True, 'Pairable': True, 'Discoverable': True, }, inner_result_func)