swarming: always append task's OS dimension to step name

scripts/slave/recipes/findit/chromium/test.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 
 from recipe_engine.config import Dict
 from recipe_engine.config import Single
 from recipe_engine.recipe_api import Property
 
@@ skipping 227 matching lines @@
         'buildername': '%s_chromium_variable' % platform_name,
         'slavename': 'build1-a1',
         'buildnumber': 1,
         'target_mastername': 'chromium.%s' % platform_name,
         'target_testername': tester_name,
         'good_revision': 'r0',
         'bad_revision': 'r1',
         'tests': tests,
         'use_analyze': use_analyze,
     }
-    return api.properties(**properties)
+    return api.properties(**properties) + api.platform.name(platform_name)
 
   def simulated_gtest_output(failed_test_names=(), passed_test_names=()):
     cur_iteration_data = {}
     for test_name in failed_test_names:
       cur_iteration_data[test_name] = [{
           'elapsed_time_ms': 0,
           'output_snippet': '',
           'status': 'FAILURE',
       }]
     for test_name in passed_test_names:
@@ skipping 46 matching lines @@
       })) +
       api.override_step_data(
           'test r1.analyze',
           api.json.output({
               'status': 'Found dependency',
               'compile_targets': ['affected_tests', 'affected_tests_run'],
               'test_targets': ['affected_tests', 'affected_tests_run'],
           })
       ) +
       api.override_step_data(
-          'test r1.affected_tests (r1)',
+          'test r1.affected_tests (r1) on Windows-7-SP1',
           simulated_gtest_output(passed_test_names=['Test.One'])
       )
   )
 
   yield (
       api.test('test_without_targets_not_skipped') +
       props({'unaffected_tests': ['Test.One'], 'checkperms': []},
             'win', 'Win7 Tests (1)', use_analyze=True) +
       api.override_step_data('test r1.read test spec', api.json.output({
           'Win7 Tests (1)': {
@@ skipping 29 matching lines @@
           'Win7 Tests (1)': {
               'gtest_tests': [
                   {
                       'test': 'gl_tests',
                       'swarming': {'can_use_on_swarming_builders': True},
                   },
               ],
           },
       })) +
       api.override_step_data(
-          'test r1.gl_tests (r1)',
+          'test r1.gl_tests (r1) on Windows-7-SP1',
           simulated_gtest_output(
               failed_test_names=['Test.One', 'Test.Two', 'Test.Three'])
       )
   )
 
   yield (
       api.test('all_test_passed') +
       props({'gl_tests': ['Test.One', 'Test.Two', 'Test.Three']},
             'win', 'Win7 Tests (1)') +
       api.override_step_data('test r1.read test spec', api.json.output({
           'Win7 Tests (1)': {
               'gtest_tests': [
                   {
                       'test': 'gl_tests',
                       'swarming': {'can_use_on_swarming_builders': True},
                   },
               ],
           },
       })) +
       api.override_step_data(
-          'test r1.gl_tests (r1)',
+          'test r1.gl_tests (r1) on Windows-7-SP1',
           simulated_gtest_output(
               passed_test_names=['Test.One', 'Test.Two', 'Test.Three'])
       )
   )
 
   yield (
       api.test('only_one_test_passed') +
       props({'gl_tests': ['Test.One', 'Test.Two', 'Test.Three']},
             'win', 'Win7 Tests (1)') +
       api.override_step_data('test r1.read test spec', api.json.output({
           'Win7 Tests (1)': {
               'gtest_tests': [
                   {
                       'test': 'gl_tests',
                       'swarming': {'can_use_on_swarming_builders': True},
                   },
               ],
           },
       })) +
       api.override_step_data(
-          'test r1.gl_tests (r1)',
+          'test r1.gl_tests (r1) on Windows-7-SP1',
           simulated_gtest_output(
               failed_test_names=['Test.One', 'Test.Two'],
               passed_test_names=['Test.Three'])
       )
   )
 
   yield (
       api.test('compile_skipped') +
       props({'checkperms': []}, 'win', 'Win7 Tests (1)') +
       api.override_step_data('test r1.read test spec', api.json.output({
@@ skipping 41 matching lines @@
                       'swarming': {'can_use_on_swarming_builders': True},
                   },
               ],
           },
       })) +
       api.override_step_data(
           'test r1.gl_tests (r1) on Mac-10.9',
           simulated_gtest_output(passed_test_names=['Test.One'])
       )
   )