From e4e15044c39013d8d4f5c94bfd71638d3cc7fba5 Mon Sep 17 00:00:00 2001
From: Edward Lemur <ehmaldonado@chromium.org>
Date: Thu, 28 Jun 2018 18:07:00 +0000
Subject: [PATCH] gclient: Don't include CIPD package name in hierarchy.

It causes flakiness, since the package that is responsible for
printing the dependency is not always the same.

Bug: None
Change-Id: I887d740d6a903cb0d5e6c080b76feab78a54effd
Reviewed-on: https://chromium-review.googlesource.com/1116191
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
---
 gclient.py                 | 3 +++
 tests/gclient_smoketest.py | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gclient.py b/gclient.py
index 228abf7b2c..3a70aa9ae4 100755
--- a/gclient.py
+++ b/gclient.py
@@ -1853,6 +1853,9 @@ class CipdDependency(Dependency):
         self.url, self.root.root_dir, self.name, self.outbuf, out_cb,
         root=self._cipd_root, package=self._cipd_package)
 
+  def hierarchy(self, include_url=False):
+    return self.parent.hierarchy(include_url) + ' -> ' + self._cipd_subdir
+
   def ToLines(self):
     """Return a list of lines representing this in a DEPS file."""
     s = []
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index 9d34df804c..bded04e85f 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -1397,7 +1397,7 @@ class GClientSmokeGIT(GClientSmokeBase):
         '    "url": "' + self.git_base + 'repo_14",',
         '  },',
         '',
-        '  # src -> src/another_cipd_dep:package1',
+        '  # src -> src/another_cipd_dep',
         '  "src/another_cipd_dep": {',
         '    "packages": [',
         '      {',
@@ -1412,7 +1412,7 @@ class GClientSmokeGIT(GClientSmokeBase):
         '    "dep_type": "cipd",',
         '  },',
         '',
-        '  # src -> src/cipd_dep:package0',
+        '  # src -> src/cipd_dep',
         '  "src/cipd_dep": {',
         '    "packages": [',
         '      {',