Revert "build: roll infra_paths changes"

scripts/slave/recipes/skia/skia.py

 # Copyright 2014 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.
 
 
 # Recipe module for Skia builders.
 
 
 DEPS = [
-  'depot_tools/infra_paths',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
   'recipe_engine/properties',
   'recipe_engine/raw_io',
   'skia',
 ]
 
 
 TEST_BUILDERS = {
@@ skipping 83 matching lines @@
   for mastername, slaves in TEST_BUILDERS.iteritems():
     for slavename, builders_by_slave in slaves.iteritems():
       for builder in builders_by_slave:
         test = (
           api.test(builder) +
           api.properties(buildername=builder,
                          mastername=mastername,
                          slavename=slavename,
                          buildnumber=5,
                          revision='abc123') +
-          api.infra_paths.exists(
-              api.infra_paths['slave_build'].join('skia'),
-              api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+          api.path.exists(
+              api.path['slave_build'].join('skia'),
+              api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
           )
         )
         if 'Android' in builder:
           ccache = '/usr/bin/ccache' if 'Appurify' in builder else None
           test += api.step_data('has ccache?',
                                 stdout=api.json.output({'ccache':ccache}))
         if ('Android' in builder and
             ('Test' in builder or 'Perf' in builder) and
             not 'Appurify' in builder):
           test += AndroidTestData(builder)
         if 'ChromeOS' in builder:
           test += api.step_data('read SKP_VERSION',
                                 stdout=api.raw_io.output('42'))
           test += api.step_data('read SK_IMAGE_VERSION',
                                 stdout=api.raw_io.output('42'))
         if 'Trybot' in builder:
           test += api.properties(issue=500,
                                  patchset=1,
                                  rietveld='https://codereview.chromium.org')
         if 'Win' in builder and 'Swarming' not in builder:
           test += api.platform('win', 64)
           if builder == 'Build-Win-MSVC-x86-Debug-VS2015':
-            test += api.infra_paths.exists(
-                api.infra_paths['slave_build'].join('skia', 'infra', 'bots',
+            test += api.path.exists(
+                api.path['slave_build'].join('skia', 'infra', 'bots',
                                              'win_toolchain_hash.json'))
             test += api.step_data('Get downloaded WIN_TOOLCHAIN_HASH',
                                   retcode=1)
 
         yield test
 
   builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
   yield (
     api.test('failed_dm') +
     api.properties(buildername=builder,
@@ skipping 25 matching lines @@
                    revision='abc123') +
     api.step_data(
                 'has ccache?',
                 stdout=api.json.output({'ccache':None})) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data('read SK_IMAGE_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data('get uninteresting hashes', retcode=1) +
-    api.infra_paths.exists(
-        api.infra_paths['slave_build'].join('skia'),
-        api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     )
   )
 
   yield (
     api.test('download_and_push_skps') +
     api.properties(buildername=builder,
                    mastername=master,
                    slavename=slave,
                    buildnumber=6,
                    revision='abc123',
                    test_downloaded_skp_version='2') +
     api.step_data(
                 'has ccache?',
                 stdout=api.json.output({'ccache':None})) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('2')) +
     api.step_data('read SK_IMAGE_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data(
         'exists skps',
         stdout=api.raw_io.output('')) +
-    api.infra_paths.exists(
-        api.infra_paths['slave_build'].join('skia'),
-        api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     )
   )
 
   yield (
     api.test('missing_SKP_VERSION_device') +
     api.properties(buildername=builder,
                    mastername=master,
                    slavename=slave,
                    buildnumber=6,
                    revision='abc123') +
     api.step_data(
                 'has ccache?',
                 stdout=api.json.output({'ccache':None})) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   retcode=1) +
     api.step_data('read SK_IMAGE_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data(
         'exists skps',
         stdout=api.raw_io.output('')) +
-    api.infra_paths.exists(
-        api.infra_paths['slave_build'].join('skia'),
-        api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     )
   )
 
   yield (
     api.test('download_and_push_skimage') +
     api.properties(buildername=builder,
                    mastername=master,
                    slavename=slave,
                    buildnumber=6,
                    revision='abc123',
                    test_downloaded_sk_image_version='2') +
     api.step_data(
                 'has ccache?',
                 stdout=api.json.output({'ccache':None})) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data('read SK_IMAGE_VERSION',
                   stdout=api.raw_io.output('2')) +
     api.step_data(
         'exists skia_images',
         stdout=api.raw_io.output('')) +
-    api.infra_paths.exists(
-        api.infra_paths['slave_build'].join('skia'),
-        api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     )
   )
 
   yield (
     api.test('missing_SK_IMAGE_VERSION_device') +
     api.properties(buildername=builder,
                    mastername=master,
                    slavename=slave,
                    buildnumber=6,
                    revision='abc123') +
     api.step_data(
                 'has ccache?',
                 stdout=api.json.output({'ccache':None})) +
     AndroidTestData(builder) +
     api.step_data('read SKP_VERSION',
                   stdout=api.raw_io.output('42')) +
     api.step_data('read SK_IMAGE_VERSION',
                   retcode=1) +
     api.step_data(
         'exists skia_images',
         stdout=api.raw_io.output('')) +
-    api.infra_paths.exists(
-        api.infra_paths['slave_build'].join('skia'),
-        api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     )
   )
 
   builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug'
   master = 'client.skia'
   slave = 'skiabot-linux-test-000'
   yield (
     api.test('missing_SKP_VERSION_host') +
     api.properties(buildername=builder,
                    mastername=master,
                    slavename=slave,
                    buildnumber=6,
                    revision='abc123') +
     api.step_data('Get downloaded SKP_VERSION', retcode=1) +
-    api.infra_paths.exists(
-        api.infra_paths['slave_build'].join('skia'),
-        api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     )
   )
 
   yield (
     api.test('missing_SK_IMAGE_VERSION_host') +
     api.properties(buildername=builder,
                    mastername=master,
                    slavename=slave,
                    buildnumber=6,
                    revision='abc123') +
     api.step_data('Get downloaded SK_IMAGE_VERSION', retcode=1) +
-    api.infra_paths.exists(
-        api.infra_paths['slave_build'].join('skia'),
-        api.infra_paths['slave_build'].join('tmp', 'uninteresting_hashes.txt')
+    api.path.exists(
+        api.path['slave_build'].join('skia'),
+        api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt')
     )
   )