commit d394458a52e41e62bd03b1244caabe8dc1719f30
author LaMont Jones <lamontjones@chromium.org> Wed Mar 04 10:37:05 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Mar 05 03:00:05 2020 +0000
tree a67098dba4eeaf930f95a8b4c7ae3d6f6cdf09c5
parent cd1503dc168535d104f5b991349958c35a80afbf

toolchain: update internal names for artifacts.

Change the internal names for the toolchain artifacts to match the new
names in the proto definition.

BUG=chromium:1019868
TEST=unit tests

Change-Id: Id1b240d9e48e2fe4ff0f12f0c0687694f6a28caf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2087106
Tested-by: LaMont Jones <lamontjones@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>

api/controller/toolchain_unittest.py

diff --git a/api/controller/toolchain_unittest.py b/api/controller/toolchain_unittest.py
index 5e7d9dc..b5bb02f 100644
--- a/api/controller/toolchain_unittest.py
+++ b/api/controller/toolchain_unittest.py
@@ -193,7 +193,7 @@
         toolchain_util, 'BundleArtifacts', return_value=[])
     self.PatchObject(toolchain, '_TOOLCHAIN_ARTIFACT_HANDLERS', {
         BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE:
-            toolchain._Handlers('UnverifiedOrderingFile',
+            toolchain._Handlers('UnverifiedChromeLlvmOrderfile',
                                 self.prep, self.bundle),
     })
 
@@ -219,7 +219,7 @@
         chroot=None, sysroot=None)
     toolchain.PrepareForBuild(request, self.response, self.api_config)
     self.prep.assert_called_once_with(
-        'UnverifiedOrderingFile', None, '', '', {}, {})
+        'UnverifiedChromeLlvmOrderfile', None, '', '', {}, {})
 
   def testHandlesUnknownInputArtifacts(self):
     request = toolchain_pb2.PrepareForToolchainBuildRequest(
@@ -232,7 +232,7 @@
         ])
     toolchain.PrepareForBuild(request, self.response, self.api_config)
     self.prep.assert_called_once_with(
-        'UnverifiedOrderingFile', None, '', '', {}, {})
+        'UnverifiedChromeLlvmOrderfile', None, '', '', {}, {})
 
   def testPassesAdditionalArgs(self):
     request = toolchain_pb2.PrepareForToolchainBuildRequest(
@@ -253,9 +253,10 @@
     )
     toolchain.PrepareForBuild(request, self.response, self.api_config)
     self.prep.assert_called_once_with(
-        'UnverifiedOrderingFile', None, '', '', {
-            'UnverifiedOrderingFile': [
-                'gs://path1', 'gs://path2', 'gs://path3']},
+        'UnverifiedChromeLlvmOrderfile', None, '', '', {
+            'UnverifiedChromeLlvmOrderfile': [
+                'gs://path1', 'gs://path2', 'gs://path3'],
+        },
         {'chrome_cwp_profile': 'CWPVERSION'})
 
   def testHandlesDuplicateInputArtifacts(self):
@@ -274,9 +275,10 @@
         ])
     toolchain.PrepareForBuild(request, self.response, self.api_config)
     self.prep.assert_called_once_with(
-        'UnverifiedOrderingFile', None, '', '', {
-            'UnverifiedOrderingFile': [
-                'gs://path1', 'gs://path2', 'gs://path3']}, {})
+        'UnverifiedChromeLlvmOrderfile', None, '', '', {
+            'UnverifiedChromeLlvmOrderfile': [
+                'gs://path1', 'gs://path2', 'gs://path3'],
+        }, {})
 
 
 class BundleToolchainTest(cros_test_lib.MockTempDirTestCase,
@@ -292,7 +294,7 @@
         toolchain_util, 'BundleArtifacts', return_value=[])
     self.PatchObject(toolchain, '_TOOLCHAIN_ARTIFACT_HANDLERS', {
         BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE:
-            toolchain._Handlers('UnverifiedOrderingFile',
+            toolchain._Handlers('UnverifiedChromeLlvmOrderfile',
                                 self.prep, self.bundle),
     })