Don't assume existence of dimensions when querying for Swarming bots

client/swarming.py

 #!/usr/bin/env python
 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Client tool to trigger tasks or retrieve results from a Swarming server."""
 
 __version__ = '0.8.7'
 
 import collections
@@ skipping 1132 matching lines @@
 
   for bot in natsort.natsorted(bots, key=lambda x: x['bot_id']):
     if options.dead_only:
       if not bot.get('is_dead'):
         continue
     elif not options.keep_dead and bot.get('is_dead'):
       continue
 
     # If the user requested to filter on dimensions, ensure the bot has all the
     # dimensions requested.
-    dimensions = {i['key']: i.get('value') for i in bot['dimensions']}
+    dimensions = {i['key']: i.get('value') for i in bot.get('dimensions', {})}
     for key, value in options.dimensions:
       if key not in dimensions:
         break
       # A bot can have multiple value for a key, for example,
       # {'os': ['Windows', 'Windows-6.1']}, so that --dimension os=Windows will
       # be accepted.
       if isinstance(dimensions[key], list):
         if value not in dimensions[key]:
           break
       else:
@@ skipping 471 matching lines @@
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParserSwarming(version=__version__), args)
 
 
 if __name__ == '__main__':
   subprocess42.inhibit_os_error_reporting()
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   sys.exit(main(sys.argv[1:]))