[gclient] Use a single CIPD root for an entire gclient checkout.
gclient previously used a CIPD root per DEPS file. This didn't work
in cases in which a DEPS file wanted to specify a CIPD package outside
of its directory hierarchy, though, as is the case with buildspecs.
Bug: 755920
Change-Id: I0d6c3db567f17f9171c0feaaf9ed6bc64db22757
Reviewed-on: https://chromium-review.googlesource.com/955933
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 7dea9d9..dd9fc67 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -929,27 +929,10 @@
self.fail('Unable to find a satisfactory package.')
- def testSingleRootAuthority(self):
- """Checks that exactly one package has root authority."""
- self.assertEquals(1, len([p for p in self._cipd_packages
- if p.authority_for_root]))
-
def testRevert(self):
- """Checks that revert w/ root authority clobbers and reruns ensure."""
+ """Checks that revert does nothing."""
scm = self.createScmWithPackageThatSatisfies(
- lambda p: p.authority_for_root)
-
- self._cipd_root.clobber()
- self._cipd_root.ensure()
-
- self.mox.ReplayAll()
-
- scm.revert(None, (), [])
-
- def testRevertWithoutAuthority(self):
- """Checks that revert w/o root authority does nothing."""
- scm = self.createScmWithPackageThatSatisfies(
- lambda p: not p.authority_for_root)
+ lambda _: True)
self.mox.ReplayAll()
@@ -991,20 +974,9 @@
self.assertEquals(revinfo, expected_revinfo)
def testUpdate(self):
- """Checks that update w/ root authority runs ensure."""
+ """Checks that update does nothing."""
scm = self.createScmWithPackageThatSatisfies(
- lambda p: p.authority_for_root)
-
- self._cipd_root.ensure()
-
- self.mox.ReplayAll()
-
- scm.update(None, (), [])
-
- def testUpdateWithoutAuthority(self):
- """Checks that update w/o root authority does nothing."""
- scm = self.createScmWithPackageThatSatisfies(
- lambda p: not p.authority_for_root)
+ lambda _: True)
self.mox.ReplayAll()