commit 31fd5803ed957a8152728208c770e10580f8c7d8
author Chris McDonald <cjmcdonald@chromium.org> Fri Feb 07 15:10:46 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Feb 11 04:08:43 2020 +0000
tree 20fdcac43089375b98de3b5a56990745c4306cea
parent fdc09b9774a9b2eda184b5a9796e814cd7cdd266

Remove ChrootPaths class

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

BUG=None
TEST=None

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

api/controller/sdk.py

diff --git a/api/controller/sdk.py b/api/controller/sdk.py
index babdc93..a627702 100644
--- a/api/controller/sdk.py
+++ b/api/controller/sdk.py
@@ -45,9 +45,12 @@
   if config.validate_only:
     return controller.RETURN_CODE_VALID_INPUT
 
-  paths = sdk.ChrootPaths(cache_dir=cache_dir, chroot_path=chroot_path)
-  args = sdk.CreateArguments(replace=replace, bootstrap=bootstrap,
-                             use_image=use_image, paths=paths)
+  args = sdk.CreateArguments(
+      replace=replace,
+      bootstrap=bootstrap,
+      use_image=use_image,
+      cache_dir=cache_dir,
+      chroot_path=chroot_path)
 
   version = sdk.Create(args)
 

api/controller/sdk_unittest.py

diff --git a/api/controller/sdk_unittest.py b/api/controller/sdk_unittest.py
index 01b6203..dff3589 100644
--- a/api/controller/sdk_unittest.py
+++ b/api/controller/sdk_unittest.py
@@ -96,19 +96,6 @@
     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)
-
 
 class SdkUpdateTest(cros_test_lib.MockTestCase, api_config.ApiConfigMixin):
   """Update tests."""