jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/369499 )
Change subject: Fix actual tested minimum required number of lines
......................................................................
Fix actual tested minimum required number of lines
From the first implementation, it wouldn't fail when the commit message only
contained two lines, even if the requirement was that it has at least three
lines.
Change-Id: I8f8ce8acc540bff4a8e8759c57d53969cae91a6b
---
M commit_message_validator/__init__.py
A commit_message_validator/tests/data/short_one_line.msg
A commit_message_validator/tests/data/short_one_line.out
A commit_message_validator/tests/data/short_two_lines.msg
A commit_message_validator/tests/data/short_two_lines.out
5 files changed, 17 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/commit_message_validator/__init__.py
b/commit_message_validator/__init__.py
index 7b05a40..fc3adea 100644
--- a/commit_message_validator/__init__.py
+++ b/commit_message_validator/__init__.py
@@ -220,7 +220,7 @@
last_lineno = rline
last_line = line
- if last_lineno < 2:
+ if last_lineno < 3:
errors.append("Line %d: Expected at least 3 lines" % last_lineno)
if changeid_line is False:
diff --git a/commit_message_validator/tests/data/short_one_line.msg
b/commit_message_validator/tests/data/short_one_line.msg
new file mode 100644
index 0000000..9214fe6
--- /dev/null
+++ b/commit_message_validator/tests/data/short_one_line.msg
@@ -0,0 +1 @@
+Only one line
diff --git a/commit_message_validator/tests/data/short_one_line.out
b/commit_message_validator/tests/data/short_one_line.out
new file mode 100644
index 0000000..9892d53
--- /dev/null
+++ b/commit_message_validator/tests/data/short_one_line.out
@@ -0,0 +1,6 @@
+commit-message-validator v%version%
+The following errors were found:
+Line 1: Expected at least 3 lines
+Line 1: Expected Change-Id
+Please review <https://www.mediawiki.org/wiki/Gerrit/Commit_message_guidelines>
+and update your commit message accordingly
diff --git a/commit_message_validator/tests/data/short_two_lines.msg
b/commit_message_validator/tests/data/short_two_lines.msg
new file mode 100644
index 0000000..de48893
--- /dev/null
+++ b/commit_message_validator/tests/data/short_two_lines.msg
@@ -0,0 +1,2 @@
+Only two lines
+Change-Id: Ifcd397165df1cbf9fa04f2044e1bb33ad7414d8d
diff --git a/commit_message_validator/tests/data/short_two_lines.out
b/commit_message_validator/tests/data/short_two_lines.out
new file mode 100644
index 0000000..87935fd
--- /dev/null
+++ b/commit_message_validator/tests/data/short_two_lines.out
@@ -0,0 +1,7 @@
+commit-message-validator v%version%
+The following errors were found:
+Line 2: Second line should be empty
+Line 2: Expected 'Change-Id:' to be in footer
+Line 2: Expected at least 3 lines
+Please review <https://www.mediawiki.org/wiki/Gerrit/Commit_message_guidelines>
+and update your commit message accordingly
--
To view, visit https://gerrit.wikimedia.org/r/369499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f8ce8acc540bff4a8e8759c57d53969cae91a6b
Gerrit-PatchSet: 2
Gerrit-Project: integration/commit-message-validator
Gerrit-Branch: master
Gerrit-Owner: XZise <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
