@@ -388,17 +388,17 @@ def combine_config(platform, config, config_value, k):
388388 if len (config_value ) > 1 and len (config ) == len (config_value ):
389389 config = ["All %d %s" % (len (config_value ), config_name )]
390390 elif config_name == "ios_device" :
391- ftl_devices = set (filter (lambda device : get_test_device (device ).get ("type" ) in "ftl" , config_value ))
392- simulators = set (filter (lambda device : get_test_device (device ).get ("type" ) in "virtual" , config_value ))
391+ ftl_devices = set (filter (lambda device : get_test_device (device ) and get_test_device ( device ) .get ("type" ) in "ftl" , config_value ))
392+ simulators = set (filter (lambda device : get_test_device (device ) and get_test_device ( device ) .get ("type" ) in "virtual" , config_value ))
393393 if len (ftl_devices ) > 1 and ftl_devices .issubset (set (config )):
394394 config .insert (0 , "All %d FTL Devices" % len (ftl_devices ))
395395 config = [x for x in config if (x not in ftl_devices )]
396396 if len (simulators ) > 1 and simulators .issubset (set (config )):
397397 config .insert (0 , "All %d Local Simulators" % len (simulators ))
398398 config = [x for x in config if (x not in simulators )]
399399 elif config_name == "android_device" :
400- ftl_devices = set (filter (lambda device : get_test_device (device ).get ("type" ) in "ftl" , config_value ))
401- emulators = set (filter (lambda device : get_test_device (device ).get ("type" ) in "virtual" , config_value ))
400+ ftl_devices = set (filter (lambda device : get_test_device (device ) and get_test_device ( device ) .get ("type" ) in "ftl" , config_value ))
401+ emulators = set (filter (lambda device : get_test_device (device ) and get_test_device ( device ) .get ("type" ) in "virtual" , config_value ))
402402 if len (ftl_devices ) > 1 and ftl_devices .issubset (set (config )):
403403 config .insert (0 , "All %d FTL Devices" % len (ftl_devices ))
404404 config = [x for x in config if (x not in ftl_devices )]
0 commit comments