commit 5dcdb89598eafe4163f848ce26874bdb11419ad5
author Chris McDonald <cjmcdonald@chromium.org> Fri Feb 07 15:10:46 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Feb 11 22:09:32 2020 +0000
tree 6e6a29e038807dc27b2b9759f09230733f2977fd
parent cb8992a734b276cc312f9cbd5d7155c8f3122dcc

Reland: Remove ChrootPaths class

This class only had two fields that can easily just be passed as args.

Fixed SDK unittests to respect the new fields as well.

BUG=None
TEST=run_tests

Change-Id: I51473562307e100fae9eae2cfc6a88f6a0b8f270
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2050029
Tested-by: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>

api/controller/sdk_unittest.py

diff --git a/api/controller/sdk_unittest.py b/api/controller/sdk_unittest.py
index 01b6203..b8e11b4 100644
--- a/api/controller/sdk_unittest.py
+++ b/api/controller/sdk_unittest.py
@@ -80,8 +80,12 @@
     request = self._GetRequest(no_replace=False, bootstrap=False,
                                no_use_image=False)
     sdk_controller.Create(request, self.response, self.api_config)
-    args_patch.assert_called_with(replace=True, bootstrap=False,
-                                  use_image=True, paths=mock.ANY)
+    args_patch.assert_called_with(
+        replace=True,
+        bootstrap=False,
+        use_image=True,
+        chroot_path=mock.ANY,
+        cache_dir=mock.ANY)
 
   def testTrueArguments(self):
     """Test True arguments handling."""
@@ -93,21 +97,12 @@
     request = self._GetRequest(no_replace=True, bootstrap=True,
                                no_use_image=True)
     sdk_controller.Create(request, self.response, self.api_config)
-    args_patch.assert_called_with(replace=False, bootstrap=True,
-                                  use_image=False, paths=mock.ANY)
-
-  def testPathArguments(self):
-    """Test the path arguments handling."""
-    # Create the patches.
-    self.PatchObject(sdk_service, 'Create', return_value=1)
-    paths_patch = self.PatchObject(sdk_service, 'ChrootPaths')
-
-    # Test the path arguments get passed through.
-    cache_dir = '/cache/dir'
-    chroot_path = '/chroot/path'
-    request = self._GetRequest(cache_path=cache_dir, chroot_path=chroot_path)
-    sdk_controller.Create(request, self.response, self.api_config)
-    paths_patch.assert_called_with(cache_dir=cache_dir, chroot_path=chroot_path)
+    args_patch.assert_called_with(
+        replace=False,
+        bootstrap=True,
+        use_image=False,
+        chroot_path=mock.ANY,
+        cache_dir=mock.ANY)
 
 
 class SdkUpdateTest(cros_test_lib.MockTestCase, api_config.ApiConfigMixin):