Clean up steps in Chromedriver recipe.

scripts/slave/recipe_modules/chromedriver/api.py

 # Copyright 2016 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.
 
 from recipe_engine import recipe_api
 
 GS_CHROMEDRIVER_DATA_BUCKET = 'chromedriver-data'
 GS_PREBUILTS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/prebuilts'
 GS_SERVER_LOGS_URL = GS_CHROMEDRIVER_DATA_BUCKET + '/server_logs'
 
@@ skipping 122 matching lines @@
     if self.m.platform.is_linux:
       cmd = ['xvfb-run', '-a'] + cmd
     if android_package:
       cmd.extend(['--android-package', android_package])
     return cmd
 
   def run_python_tests(self, chromedriver, ref_chromedriver, chrome=None,
                        chrome_version_name=None, android_package=None,
                        archive_server_log=True, **kwargs):
     """Run the Chromedriver Python tests."""
-    version_info = ''
-    if chrome_version_name:
-      version_info = '(%s)' % chrome_version_name
-    with self.m.tempfile.temp_dir('server_log') as log_dir:
-      server_log = log_dir.join('server_log')
-      test_script_path = self.m.path['checkout'].join(
-          'chrome', 'test', 'chromedriver', 'test', 'run_py_tests.py')
-      self.m.step('python_tests%s' % version_info,
-                  self._generate_test_command(
-                      test_script_path, chromedriver, server_log,
-                      ref_chromedriver=ref_chromedriver,
-                      android_package=android_package),
-                  **kwargs)
-      if archive_server_log:
-        self.archive_server_log(server_log)
+    test_name = 'python_tests%s' % (
+        ' %s' % chrome_version_name if chrome_version_name else '')
+    build_number = self.m.properties['buildnumber']
+
+    with self.m.step.nest(test_name):
+      try:
+        server_log_dir = self.m.path.mkdtemp('server_log')

[the real yoland, 2016/07/20 21:25:54]

you can still use temp_dir context manager

[mikecase (-- gone --), 2016/07/20 21:46:22]

This was a good idea. Switched to use the temp_dir context manager about 5
places in this file to clean up the code.

+        server_log = server_log_dir.join(
+            ('%s_%s' % (test_name, build_number)).replace(' ', '_'))
+
+        test_script_path = self.m.path['checkout'].join(
+            'chrome', 'test', 'chromedriver', 'test', 'run_py_tests.py')
+        self.m.step('Run test %s' % test_name,
+                    self._generate_test_command(
+                        test_script_path, chromedriver, server_log,
+                        ref_chromedriver=ref_chromedriver,
+                        android_package=android_package),
+                    **kwargs)
+        if archive_server_log:
+          self.archive_server_log(server_log)
+      finally:
+        self.m.shutil.rmtree(server_log_dir)
 
   def run_java_tests(self, chromedriver, chrome=None, chrome_version_name=None,
                      android_package=None, verbose=False,
                      archive_server_log=True, **kwargs):
     """Run the Chromedriver Java tests."""
-    version_info = ''
-    if chrome_version_name:
-      version_info = '(%s)' % chrome_version_name
-    with self.m.tempfile.temp_dir('server_log') as log_dir:
-      server_log = log_dir.join('server_log')
-      test_script_path = self.m.path['checkout'].join(
-          'chrome', 'test', 'chromedriver', 'test', 'run_java_tests.py')
-      self.m.step('java_tests%s' % version_info,
-                  self._generate_test_command(
-                      test_script_path, chromedriver, server_log,
-                      ref_chromedriver=None, android_package=android_package,
-                      verbose=verbose),
-                  **kwargs)
-      if archive_server_log:
-        self.archive_server_log(server_log)
+    test_name = 'java_tests%s' % (
+        ' %s' % chrome_version_name if chrome_version_name else '')
+    build_number = self.m.properties['buildnumber']
+
+    with self.m.step.nest(test_name):
+      try:
+        server_log_dir = self.m.path.mkdtemp('server_log')
+        server_log = server_log_dir.join(
+            ('%s_%s' % (test_name, build_number)).replace(' ', '_'))
+
+        test_script_path = self.m.path['checkout'].join(
+            'chrome', 'test', 'chromedriver', 'test', 'run_java_tests.py')
+        self.m.step('Run test %s' % test_name,
+                    self._generate_test_command(
+                        test_script_path, chromedriver, server_log,
+                        ref_chromedriver=None, android_package=android_package,
+                        verbose=verbose),
+                    **kwargs)
+        if archive_server_log:
+          self.archive_server_log(server_log)
+      finally:
+        self.m.shutil.rmtree(server_log_dir)
 
   def run_all_tests(self, android_packages=None, archive_server_logs=True):
     """Run all Chromedriver tests."""
     server_name = 'chromedriver'
     chromedriver = self.m.chromium.output_dir.join(server_name)
 
     platform_name = self.m.platform.name
     if self.m.platform.is_linux and self.m.platform.bits == 64:
       platform_name = 'linux64'
     ref_chromedriver = self.m.path['checkout'].join(
@@ skipping 12 matching lines @@
                               chrome_version_name=package,
                               android_package=package,
                               env=test_env,
                               archive_server_log=archive_server_logs)
         self.run_java_tests(chromedriver,
                             chrome_version_name=package,
                             android_package=package,
                             verbose=True,
                             env=test_env,
                             archive_server_log=archive_server_logs)