Promote 'model' from state to dimension for Macs.

appengine/swarming/swarming_bot/api/os_utilities_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 import logging
 import math
 import os
 import re
 import subprocess
@@ skipping 80 matching lines @@
 
   def test_get_dimensions(self):
     actual = set(os_utilities.get_dimensions())
     # Only set on GCE.
     actual.discard(u'machine_type')
     actual.discard(u'zone')
     # Only set on Mac.
     actual.discard(u'hidpi')
     expected = {u'cores', u'cpu', u'gpu', u'id', u'os', u'pool'}
     if sys.platform == 'darwin':
+      expected.add(u'mac_model')
       expected.add(u'xcode_version')
     self.assertEqual(expected, actual)
 
   def test_get_state(self):
     actual = os_utilities.get_state()
     actual.pop('temp', None)
     expected = {
       u'audio', u'cost_usd_hour', u'cpu_name', u'cwd', u'disks', u'gpu', u'ip',
       u'hostname', u'locale', u'nb_files_in_temp', u'pid', u'ram',
       u'running_time', u'started_ts', u'uptime', u'user',
     }
     if sys.platform in ('cygwin', 'win32'):
       expected.add(u'cygwin')
     if sys.platform == 'darwin':
-      expected.add(u'model')
       expected.add(u'xcode')
     if sys.platform == 'win32':
       expected.add(u'integrity')
     self.assertEqual(expected, set(actual))
 
   def test_setup_auto_startup_win(self):
     # TODO(maruel): Figure out a way to test properly.
     pass
 
   def test_setup_auto_startup_osx(self):
@@ skipping 34 matching lines @@
     self.assertFalse(os_utilities.host_reboot(timeout=60))
     self.assertEqual(time.time(), 60)
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
   unittest.main()