commit 52148581e26ca323abc3caa8b97117ab81e10c30
author Chris Sosa <sosa@chromium.org> Thu Nov 15 15:35:58 2012 -0800
committer Gerrit <chrome-bot@google.com> Fri Nov 16 15:53:43 2012 -0800
tree 0d19e62f3c854e0920afc0845c62aa6c02b1ad68
parent 1502ea6720f4553854cd37fad5443e73d1d56dad

Refactor the devserver to make autoupdate protocol logic shareable.

This CL refactors the devservers AU logic to allow it to be shareable
with cros_image_to_target (which originally forked this code). This allows
the latter to be both compatible with both 2.0 and 3.0 protocols.

I also fixed the unittests that were broken by
I2b96047a95a66aa920dc5fd1f54807f0541af554

BUG=chromium-os:36418
TEST=Pylint + Unittests + image_to_live

Change-Id: I73cf6343c4fce7289c660bc1cda7fe63cd16c881
Reviewed-on: https://gerrit.chromium.org/gerrit/38159
Commit-Ready: Chris Sosa <sosa@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>

autoupdate_unittest.py

diff --git a/autoupdate_unittest.py b/autoupdate_unittest.py
index f06b981..9733512 100755
--- a/autoupdate_unittest.py
+++ b/autoupdate_unittest.py
@@ -15,14 +15,15 @@
 import mox
 
 import autoupdate
+import autoupdate_lib
 import common_util
 
 
 _TEST_REQUEST = """
-<client_test xmlns:o="http://www.google.com/update2/request" updaterversion="%(client)s" >
-  <o:app version="%(version)s" track="%(track)s" board="%(board)s" />
-  <o:updatecheck />
-  <o:event eventresult="%(event_result)d" eventtype="%(event_type)d" />
+<client_test xmlns:o="http://www.google.com/update2/request" updaterversion="%(client)s" protocol="3.0">
+  <app version="%(version)s" track="%(track)s" board="%(board)s" />
+  <updatecheck />
+  <event eventresult="%(event_result)d" eventtype="%(event_type)d" />
 </client_test>"""
 
 
@@ -32,7 +33,7 @@
     self.mox.StubOutWithMock(common_util, 'GetFileSize')
     self.mox.StubOutWithMock(common_util, 'GetFileSha1')
     self.mox.StubOutWithMock(common_util, 'GetFileSha256')
-    self.mox.StubOutWithMock(autoupdate.Autoupdate, 'GetUpdatePayload')
+    self.mox.StubOutWithMock(autoupdate_lib, 'GetUpdateResponse')
     self.mox.StubOutWithMock(autoupdate.Autoupdate, '_GetLatestImageDir')
     self.mox.StubOutWithMock(autoupdate.Autoupdate, '_GetRemotePayloadAttrs')
     self.port = 8080
@@ -121,9 +122,9 @@
         self.static_image_dir, 'update.gz')).AndReturn(self.sha256)
     common_util.GetFileSize(os.path.join(
         self.static_image_dir, 'update.gz')).AndReturn(self.size)
-    autoupdate.Autoupdate.GetUpdatePayload(
-        self.sha1, self.sha256, self.size, self.url, False).AndReturn(
-            self.payload)
+    autoupdate_lib.GetUpdateResponse(
+        self.sha1, self.sha256, self.size, self.url, False, '3.0',
+        False).AndReturn(self.payload)
 
     self.mox.ReplayAll()
     au_mock = self._DummyAutoupdateConstructor()
@@ -145,8 +146,8 @@
         self.static_image_dir, 'update.gz')).AndReturn(self.sha256)
     common_util.GetFileSize(os.path.join(
         self.static_image_dir, 'update.gz')).AndReturn(self.size)
-    autoupdate.Autoupdate.GetUpdatePayload(
-        self.sha1, self.sha256, self.size, self.url, False).AndReturn(
+    autoupdate_lib.GetUpdateResponse(
+        self.sha1, self.sha256, self.size, self.url, False, '3.0', False).AndReturn(
             self.payload)
 
     self.mox.ReplayAll()
@@ -217,9 +218,9 @@
         new_image_dir, 'update.gz')).AndReturn(self.sha256)
     common_util.GetFileSize(os.path.join(
         new_image_dir, 'update.gz')).AndReturn(self.size)
-    autoupdate.Autoupdate.GetUpdatePayload(
-        self.sha1, self.sha256, self.size, new_url, False).AndReturn(
-            self.payload)
+    autoupdate_lib.GetUpdateResponse(
+        self.sha1, self.sha256, self.size, new_url, False, '3.0',
+        False).AndReturn(self.payload)
 
     self.mox.ReplayAll()
     au_mock = self._DummyAutoupdateConstructor()
@@ -280,9 +281,9 @@
 
     autoupdate.Autoupdate._GetRemotePayloadAttrs(remote_url).AndReturn(
             (self.sha1, self.sha256, self.size, False))
-    autoupdate.Autoupdate.GetUpdatePayload(
-        self.sha1, self.sha256, self.size, remote_url, False).AndReturn(
-            self.payload)
+    autoupdate_lib.GetUpdateResponse(
+        self.sha1, self.sha256, self.size, remote_url, False,
+        '3.0', False).AndReturn(self.payload)
 
     self.mox.ReplayAll()
     au_mock = self._DummyAutoupdateConstructor(urlbase=remote_urlbase,