Fix repohooks Cq-Depend error message
BUG=chromium:960540
TEST=./pre-upload_unittest.py
Change-Id: I3b9d9a32d5f620cd322970468263c20a14ac324b
Reviewed-on: https://chromium-review.googlesource.com/1627298
Commit-Ready: Jason Clinton <jclinton@chromium.org>
Tested-by: Jason Clinton <jclinton@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
diff --git a/pre-upload.py b/pre-upload.py
index 0625d89..db6edc2 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -559,9 +559,9 @@
def _check_change_has_valid_cq_depend(_project, commit):
- """Check for a correctly formatted CQ-DEPEND field in the commit message."""
- msg = 'Changelist has invalid CQ-DEPEND target.'
- example = 'Example: CQ-DEPEND=CL:1234, CL:2345'
+ """Check for a correctly formatted Cq-Depend field in the commit message."""
+ msg = 'Changelist has invalid Cq-Depend target.'
+ example = 'Example: Cq-Depend: chromium:1234, chrome-internal:2345'
try:
patch.GetPaladinDeps(_get_commit_desc(commit))
except ValueError as ex:
diff --git a/pre-upload_unittest.py b/pre-upload_unittest.py
index 0f71bf4..7ad2504 100755
--- a/pre-upload_unittest.py
+++ b/pre-upload_unittest.py
@@ -1052,13 +1052,13 @@
return pre_upload._check_change_has_valid_cq_depend(project, commit)
def testNormal(self):
- """Accept valid CQ-DEPENDs line."""
- self.assertMessageAccepted('\nCQ-DEPEND=CL:1234\n')
+ """Accept valid Cq-Depends line."""
+ self.assertMessageAccepted('\nCq-Depend: chromium:1234\n')
def testInvalid(self):
- """Reject invalid CQ-DEPENDs line."""
- self.assertMessageRejected('\nCQ-DEPEND=CL=1234\n')
- self.assertMessageRejected('\nCQ-DEPEND=None\n')
+ """Reject invalid Cq-Depends line."""
+ self.assertMessageRejected('\nCq-Depend=chromium=1234\n')
+ self.assertMessageRejected('\nCq-Depend: None\n')
class CheckCommitMessageContribution(CommitMessageTestCase):
