commit 07293a3727326719c652334aedd7e552cf4e4078
author herbertxue <herbertxue@google.com> Mon Nov 05 20:40:11 2018 +0800
committer Herbert Xue <herbertxue@google.com> Thu Nov 15 02:14:05 2018 +0000
tree 7f71bc20e71c9e6a02544224ca5cdda6545b2880
parent 7657caf1f5f2c5b921293f18d74896ed00f791f2

Support delete local instance in acloud deleted function.

Bug: 117474343
Test: m acloud && atest acloud_test && acloud delete
Change-Id: I925308163e5d55a1dbce1a11f13802557bd840f5

setup/host_setup_runner_test.py

diff --git a/setup/host_setup_runner_test.py b/setup/host_setup_runner_test.py
index 4ec8290..b424db5 100644
--- a/setup/host_setup_runner_test.py
+++ b/setup/host_setup_runner_test.py
@@ -12,13 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Tests for host_setup_runner."""
-import grp
-import os
 import platform
 import unittest
-import mock
 
 from acloud.internal.lib import driver_test_lib
+from acloud.internal.lib import utils
 from acloud.setup import setup_common
 from acloud.setup.host_setup_runner import CuttlefishHostSetup
 from acloud.setup.host_setup_runner import AvdPkgInstaller
@@ -43,7 +41,7 @@
 
     def testShouldRunFalse(self):
         """Test ShouldRun returns False."""
-        self.Patch(CuttlefishHostSetup, "CheckUserInGroups", return_value=True)
+        self.Patch(utils, "CheckUserInGroups", return_value=True)
         self.Patch(CuttlefishHostSetup, "_CheckLoadedModules", return_value=True)
         self.assertFalse(self.CuttlefishHostSetup.ShouldRun())
 
@@ -51,39 +49,17 @@
         """Test ShouldRun returns True."""
         # 1. Checking groups fails.
         self.Patch(
-            CuttlefishHostSetup, "CheckUserInGroups", return_value=False)
+            utils, "CheckUserInGroups", return_value=False)
         self.Patch(CuttlefishHostSetup, "_CheckLoadedModules", return_value=True)
         self.assertTrue(self.CuttlefishHostSetup.ShouldRun())
 
         # 2. Checking modules fails.
-        self.Patch(CuttlefishHostSetup, "CheckUserInGroups", return_value=True)
+        self.Patch(utils, "CheckUserInGroups", return_value=True)
         self.Patch(
             CuttlefishHostSetup, "_CheckLoadedModules", return_value=False)
         self.assertTrue(self.CuttlefishHostSetup.ShouldRun())
 
     # pylint: disable=protected-access
-    def testCheckUserInGroups(self):
-        """Test CheckUserInGroups."""
-        self.Patch(os, "getgroups", return_value=[1, 2, 3])
-        gr1 = mock.MagicMock()
-        gr1.gr_name = "fake_gr_1"
-        gr2 = mock.MagicMock()
-        gr2.gr_name = "fake_gr_2"
-        gr3 = mock.MagicMock()
-        gr3.gr_name = "fake_gr_3"
-        self.Patch(grp, "getgrgid", side_effect=[gr1, gr2, gr3])
-
-        # User in all required groups should return true.
-        self.assertTrue(
-            self.CuttlefishHostSetup.CheckUserInGroups(
-                ["fake_gr_1", "fake_gr_2"]))
-
-        # User not in all required groups should return False.
-        self.Patch(grp, "getgrgid", side_effect=[gr1, gr2, gr3])
-        self.assertFalse(
-            self.CuttlefishHostSetup.CheckUserInGroups(
-                ["fake_gr_1", "fake_gr_4"]))
-
     def testCheckLoadedModules(self):
         """Test _CheckLoadedModules."""
         self.Patch(