Revert "Reland "AndroidService/MarkStable: Refactor commands.py function to service.""
This reverts commit eb8616c492bca1991e623129e83f45a3429c8f56.
Reason for revert: UprevAndroid is failing see https://crbug.com/982121.
Original change's description:
> Reland "AndroidService/MarkStable: Refactor commands.py function to service."
>
> This is a reland of e355c1c23c8ac209d91885ef31a6dcc38fbc3cfd
>
> Fixed some errors in the commands.py implementation of the endpoint
> and added a test for the method to sanity check it.
>
> BUG=chromium:956244
> TEST=run_tests
>
> Original change's description:
> > AndroidService/MarkStable: Refactor commands.py function to service.
> >
> > BUG=chromium:956244
> > TEST=run_tests
> >
> > Change-Id: I3333e5cf5fa22cb290bb0cccb7bead98ce673ded
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1682327
> > Tested-by: Alex Klein <saklein@chromium.org>
> > Reviewed-by: David Burger <dburger@chromium.org>
> > Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
> > Commit-Queue: Alex Klein <saklein@chromium.org>
>
> Bug: chromium:956244
> Change-Id: I3404f1f91ae148fc81549ef8e8cd6501958aa733
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1685412
> Tested-by: Alex Klein <saklein@chromium.org>
> Auto-Submit: Alex Klein <saklein@chromium.org>
> Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
> Commit-Queue: Alex Klein <saklein@chromium.org>
Bug: chromium:956244
Change-Id: I28411033c0f1d6bad17b2d183bcd541d9407e386
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1691788
Reviewed-by: David Burger <dburger@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: David Burger <dburger@chromium.org>
diff --git a/api/controller/android_unittest.py b/api/controller/android_unittest.py
index ea9ec7a..a67e26c 100644
--- a/api/controller/android_unittest.py
+++ b/api/controller/android_unittest.py
@@ -7,31 +7,29 @@
from __future__ import print_function
-import mock
-
from chromite.api.controller import android
from chromite.api.gen.chromite.api import android_pb2
from chromite.api.gen.chromiumos import common_pb2
+# TODO(crbug/904939): implement service/android.py
+from chromite.cbuildbot import commands
from chromite.lib import constants
from chromite.lib import cros_build_lib
from chromite.lib import cros_test_lib
from chromite.lib import osutils
-from chromite.service import packages as packages_service
-
class MarkStableTest(cros_test_lib.MockTestCase):
"""Unittests for MarkStable."""
def setUp(self):
- self.uprev = self.PatchObject(packages_service, 'uprev_android')
+ self.command = self.PatchObject(commands, 'MarkAndroidAsStable')
self.input_proto = android_pb2.MarkStableRequest()
self.input_proto.tracking_branch = 'tracking-branch'
self.input_proto.package_name = 'android-package-name'
self.input_proto.android_build_branch = 'android_build_branch'
- self.board1 = self.input_proto.build_targets.add()
+ self.board1 = self.input_proto.boards.add()
self.board1.name = 'board1'
- self.board2 = self.input_proto.build_targets.add()
+ self.board2 = self.input_proto.boards.add()
self.board2.name = 'board2'
def testFailsIfTrackingBranchMissing(self):
@@ -40,7 +38,7 @@
output_proto = android_pb2.MarkStableResponse()
with self.assertRaises(cros_build_lib.DieSystemExit):
android.MarkStable(self.input_proto, output_proto)
- self.uprev.assert_not_called()
+ self.command.assert_not_called()
def testFailsIfPackageNameMissing(self):
"""Fails if package_name is missing."""
@@ -48,7 +46,7 @@
output_proto = android_pb2.MarkStableResponse()
with self.assertRaises(cros_build_lib.DieSystemExit):
android.MarkStable(self.input_proto, output_proto)
- self.uprev.assert_not_called()
+ self.command.assert_not_called()
def testFailsIfAndroidBuildBranchMissing(self):
"""Fails if android_build_branch is missing."""
@@ -56,25 +54,25 @@
output_proto = android_pb2.MarkStableResponse()
with self.assertRaises(cros_build_lib.DieSystemExit):
android.MarkStable(self.input_proto, output_proto)
- self.uprev.assert_not_called()
+ self.command.assert_not_called()
def testCallsCommandCorrectly(self):
"""Test that commands.MarkAndroidAsStable is called correctly."""
output_proto = android_pb2.MarkStableResponse()
self.input_proto.android_version = 'android-version'
self.input_proto.android_gts_build_branch = 'gts-branch'
- self.uprev.return_value = 'cat/android-1.2.3'
+ self.command.return_value = 'cat/android-1.2.3'
atom = common_pb2.PackageInfo()
atom.category = 'cat'
atom.package_name = 'android'
atom.version = '1.2.3'
android.MarkStable(self.input_proto, output_proto)
- self.uprev.assert_called_once_with(
+ self.command.assert_called_once_with(
+ buildroot=self.input_proto.buildroot,
tracking_branch=self.input_proto.tracking_branch,
android_package=self.input_proto.package_name,
android_build_branch=self.input_proto.android_build_branch,
- chroot=mock.ANY,
- build_targets=mock.ANY,
+ boards=self.input_proto.boards,
android_version=self.input_proto.android_version,
android_gts_build_branch=self.input_proto.android_gts_build_branch)
self.assertEqual(output_proto.android_atom, atom)
@@ -86,14 +84,14 @@
output_proto = android_pb2.MarkStableResponse()
self.input_proto.android_version = 'android-version'
self.input_proto.android_gts_build_branch = 'gts-branch'
- self.uprev.return_value = ''
+ self.command.return_value = ''
android.MarkStable(self.input_proto, output_proto)
- self.uprev.assert_called_once_with(
+ self.command.assert_called_once_with(
+ buildroot=self.input_proto.buildroot,
tracking_branch=self.input_proto.tracking_branch,
android_package=self.input_proto.package_name,
android_build_branch=self.input_proto.android_build_branch,
- chroot=mock.ANY,
- build_targets=mock.ANY,
+ boards=self.input_proto.boards,
android_version=self.input_proto.android_version,
android_gts_build_branch=self.input_proto.android_gts_build_branch)
self.assertEqual(output_proto.status,
@@ -104,19 +102,18 @@
output_proto = android_pb2.MarkStableResponse()
self.input_proto.android_version = 'android-version'
self.input_proto.android_gts_build_branch = 'gts-branch'
- self.uprev.side_effect = packages_service.AndroidIsPinnedUprevError(
- 'pin/xx-1.1')
+ self.command.side_effect = commands.AndroidIsPinnedUprevError('pin/xx-1.1')
atom = common_pb2.PackageInfo()
atom.category = 'pin'
atom.package_name = 'xx'
atom.version = '1.1'
android.MarkStable(self.input_proto, output_proto)
- self.uprev.assert_called_once_with(
+ self.command.assert_called_once_with(
+ buildroot=self.input_proto.buildroot,
tracking_branch=self.input_proto.tracking_branch,
android_package=self.input_proto.package_name,
android_build_branch=self.input_proto.android_build_branch,
- chroot=mock.ANY,
- build_targets=mock.ANY,
+ boards=self.input_proto.boards,
android_version=self.input_proto.android_version,
android_gts_build_branch=self.input_proto.android_gts_build_branch)
self.assertEqual(output_proto.android_atom, atom)