commit 4f1e462a1e41010d9a0fd9464974fc0ca4522f54
author Amin Hassani <ahassani@chromium.org> Thu Oct 03 10:40:50 2019 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Oct 08 00:17:45 2019 +0000
tree 4cd634d2ae32db8ba9a40af2e544ed3bf25fec1d
parent 816c4e47df4b857ae7f4e409eee97898bddeead3

autoupdate: fix linter errors

BUG=chromium:1003986
TEST=./autoupdate_unittest.py
TEST=./devserver_integration_test.py

Change-Id: Ie1f16b82bdeaa9aab6ebaeee20be2be7ada95013
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1838131
Tested-by: Amin Hassani <ahassani@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

autoupdate_unittest.py

diff --git a/autoupdate_unittest.py b/autoupdate_unittest.py
index 1a2c73b..8a461d7 100755
--- a/autoupdate_unittest.py
+++ b/autoupdate_unittest.py
@@ -9,22 +9,18 @@
 from __future__ import print_function
 
 import json
-import os
 import shutil
 import socket
 import tempfile
 import unittest
 
-import cherrypy
-import mox
+import cherrypy  # pylint: disable=import-error
+import mock
 
 import autoupdate
 import common_util
-import devserver_constants as constants
 import xbuddy
 
-from nebraska import nebraska
-
 
 _TEST_REQUEST = """<?xml version="1.0" encoding="UTF-8"?>
 <request protocol="3.0" updater="ChromeOSUpdateEngine" updaterversion="0.1.0.0">
@@ -34,12 +30,10 @@
   </app>
 </request>"""
 
-#pylint: disable=W0212
-class AutoupdateTest(mox.MoxTestBase):
+class AutoupdateTest(unittest.TestCase):
   """Tests for the autoupdate.Autoupdate class."""
 
   def setUp(self):
-    mox.MoxTestBase.setUp(self)
     self.port = 8080
     self.test_board = 'test-board'
     self.build_root = tempfile.mkdtemp('autoupdate_build_root')
@@ -59,7 +53,7 @@
     common_util.MkDirP(self.static_image_dir)
     self._xbuddy = xbuddy.XBuddy(False,
                                  static_dir=self.static_image_dir)
-    self.mox.StubOutWithMock(xbuddy.XBuddy, '_GetArtifact')
+    mock.patch.object(xbuddy.XBuddy, '_GetArtifact')
 
   def tearDown(self):
     shutil.rmtree(self.build_root)
@@ -73,6 +67,7 @@
     return dummy
 
   def testChangeUrlPort(self):
+    # pylint: disable=protected-access
     r = autoupdate._ChangeUrlPort('http://fuzzy:8080/static', 8085)
     self.assertEqual(r, 'http://fuzzy:8085/static')