commit b3c8cab16e79ec735f6ac4e970300734938999a8
author Jae Hoon Kim <kimjae@chromium.org> Wed Nov 10 14:57:53 2021 -0800
committer Commit Bot <commit-bot@chromium.org> Thu Nov 11 14:42:44 2021 +0000
tree 831c83a8428589dc19b4695d9de5a7d66cd5e5b7
parent 42bf166a6b375726e27e9825dc24a8b72cd6904b

autoupdate: Fix unittest + update to python3

BUG=none
TEST=./run_unittests

Change-Id: I8e6bd80fe4ca265afd6a8beec7349002bfd6b007
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3273333
Tested-by: Jae Hoon Kim <kimjae@chromium.org>
Reviewed-by: Jaques Clapauch <jaquesc@google.com>
Commit-Queue: Jae Hoon Kim <kimjae@chromium.org>

autoupdate_unittest.py

diff --git a/autoupdate_unittest.py b/autoupdate_unittest.py
index cd7263a..6e67835 100755
--- a/autoupdate_unittest.py
+++ b/autoupdate_unittest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -13,7 +13,7 @@
 import tempfile
 import unittest
 
-import mock
+import unittest.mock as mock
 import cherrypy  # pylint: disable=import-error
 
 import autoupdate
@@ -83,11 +83,11 @@
     r = autoupdate._ChangeUrlPort('ftp://fuzzy', 8085)
     self.assertEqual(r, 'ftp://fuzzy:8085')
 
-  @mock.patch.object(autoupdate.Autoupdate, 'GetPathToPayload')
-  def testHandleUpdatePing(self, path_to_payload_mock):
+  @mock.patch.object(autoupdate.Autoupdate, 'GetBuildID')
+  def testHandleUpdatePing(self, get_build_id):
     """Tests HandleUpdatePing"""
     au_mock = self._DummyAutoupdateConstructor()
-    path_to_payload_mock.return_value = self.tempdir
+    get_build_id.return_value = ''
     request = """<?xml version="1.0" encoding="UTF-8"?>
 <request protocol="3.0">
   <os version="Indy" platform="Chrome OS" sp="10323.52.0_x86_64"></os>
@@ -98,7 +98,7 @@
   </app>
 </request>"""
 
-    self.assertIn('<updatecheck status="noupdate"',
+    self.assertIn(b'<updatecheck status="noupdate"',
                   au_mock.HandleUpdatePing(request))
 
 if __name__ == '__main__':