commit 2846677f9ec7725d9cf9513768477c873c19ba78
author Alex Deymo <deymo@chromium.org> Fri Sep 11 17:16:44 2015 -0700
committer chrome-bot <chrome-bot@chromium.org> Mon Sep 14 18:53:36 2015 -0700
tree 61e9a4c2a66d499c0151a4f2b3bdd359b5c04305
parent 53b62278d049a50c20e6693aeaefe9675ccb8407

paycheck: Update generated protobuf code.

This patch updates the generated update_metadata_pb2.py file with the
latest changes in the udpate_metadata.proto file. Some other changes in
the update_payload library were required to match the changes in the
.proto file.

BUG=b:23179128
TEST=paycheck unittests

Change-Id: I482d67d4a35f69438a26395eea77286994108b7a
Reviewed-on: https://chromium-review.googlesource.com/299498
Commit-Ready: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>

scripts/update_payload/checker_unittest.py

diff --git a/scripts/update_payload/checker_unittest.py b/scripts/update_payload/checker_unittest.py
index a22373f..b761873 100755
--- a/scripts/update_payload/checker_unittest.py
+++ b/scripts/update_payload/checker_unittest.py
@@ -35,6 +35,9 @@
       'BSDIFF': common.OpType.BSDIFF,
       'SOURCE_COPY': common.OpType.SOURCE_COPY,
       'SOURCE_BSDIFF': common.OpType.SOURCE_BSDIFF,
+      'ZERO': common.OpType.ZERO,
+      'DISCARD': common.OpType.DISCARD,
+      'REPLACE_XZ': common.OpType.REPLACE_XZ,
   }
   return op_name_to_type[op_name]
 
@@ -157,7 +160,7 @@
     subreport = 'fake subreport'
 
     # Create a mock message.
-    msg = self.mox.CreateMock(update_metadata_pb2.message.Message)
+    msg = self.mox.CreateMock(update_metadata_pb2._message.Message)
     msg.HasField(name).AndReturn(is_present)
     setattr(msg, name, val)
 
@@ -560,7 +563,7 @@
     data_length = 10000
 
     op = self.mox.CreateMock(
-        update_metadata_pb2.DeltaArchiveManifest.InstallOperation)
+        update_metadata_pb2.InstallOperation)
     op.type = common.OpType.REPLACE
 
     # Pass.
@@ -598,7 +601,7 @@
     data_length = block_size * 3
 
     op = self.mox.CreateMock(
-        update_metadata_pb2.DeltaArchiveManifest.InstallOperation)
+        update_metadata_pb2.InstallOperation)
     op.type = common.OpType.REPLACE_BZ
 
     # Pass.
@@ -632,7 +635,7 @@
   def testCheckMoveOperation_Pass(self):
     """Tests _CheckMoveOperation(); pass case."""
     payload_checker = checker.PayloadChecker(self.MockPayload())
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = common.OpType.MOVE
 
     self.AddToMessage(op.src_extents,
@@ -645,7 +648,7 @@
   def testCheckMoveOperation_FailContainsData(self):
     """Tests _CheckMoveOperation(); fails, message contains data."""
     payload_checker = checker.PayloadChecker(self.MockPayload())
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = common.OpType.MOVE
 
     self.AddToMessage(op.src_extents,
@@ -660,7 +663,7 @@
   def testCheckMoveOperation_FailInsufficientSrcBlocks(self):
     """Tests _CheckMoveOperation(); fails, not enough actual src blocks."""
     payload_checker = checker.PayloadChecker(self.MockPayload())
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = common.OpType.MOVE
 
     self.AddToMessage(op.src_extents,
@@ -675,7 +678,7 @@
   def testCheckMoveOperation_FailInsufficientDstBlocks(self):
     """Tests _CheckMoveOperation(); fails, not enough actual dst blocks."""
     payload_checker = checker.PayloadChecker(self.MockPayload())
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = common.OpType.MOVE
 
     self.AddToMessage(op.src_extents,
@@ -690,7 +693,7 @@
   def testCheckMoveOperation_FailExcessSrcBlocks(self):
     """Tests _CheckMoveOperation(); fails, too many actual src blocks."""
     payload_checker = checker.PayloadChecker(self.MockPayload())
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = common.OpType.MOVE
 
     self.AddToMessage(op.src_extents,
@@ -713,7 +716,7 @@
   def testCheckMoveOperation_FailExcessDstBlocks(self):
     """Tests _CheckMoveOperation(); fails, too many actual dst blocks."""
     payload_checker = checker.PayloadChecker(self.MockPayload())
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = common.OpType.MOVE
 
     self.AddToMessage(op.src_extents,
@@ -728,7 +731,7 @@
   def testCheckMoveOperation_FailStagnantBlocks(self):
     """Tests _CheckMoveOperation(); fails, there are blocks that do not move."""
     payload_checker = checker.PayloadChecker(self.MockPayload())
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = common.OpType.MOVE
 
     self.AddToMessage(op.src_extents,
@@ -743,7 +746,7 @@
   def testCheckMoveOperation_FailZeroStartBlock(self):
     """Tests _CheckMoveOperation(); fails, has extent with start block 0."""
     payload_checker = checker.PayloadChecker(self.MockPayload())
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = common.OpType.MOVE
 
     self.AddToMessage(op.src_extents,
@@ -848,7 +851,7 @@
     blob_hash_counts = collections.defaultdict(int)
 
     # Create the operation object for the test.
-    op = update_metadata_pb2.DeltaArchiveManifest.InstallOperation()
+    op = update_metadata_pb2.InstallOperation()
     op.type = op_type
 
     total_src_blocks = 0