Revert "Adapt to change in Gerrit core that changed the error messages for submit"
This reverts commit d488c5978e4b95e30e8a914def58e62452119220.
Reason for revert: Dependant on https://gerrit-review.git.corp.google.com/c/gerrit/+/430537
Change-Id: I3dce3377569181946c25e02a99f04b5113f2d7e5
Reviewed-on: https://gerrit-review.googlesource.com/c/plugins/code-owners/+/433717
Tested-by: Zuul <zuul-63@gerritcodereview-ci.iam.gserviceaccount.com>
Reviewed-by: Frank Borden <frankborden@google.com>
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerSubmitRuleIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerSubmitRuleIT.java
index 1769dce..e078738 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerSubmitRuleIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerSubmitRuleIT.java
@@ -154,9 +154,8 @@
.isEqualTo(
String.format(
"Failed to submit 1 change due to the following problems:\n"
- + "Change %d: Change %d is not ready:"
- + " submit requirement 'Code-Owners' is unsatisfied.",
- changeInfo._number, changeInfo._number));
+ + "Change %d: submit requirement 'Code-Owners' is unsatisfied.",
+ changeInfo._number));
}
@Test
@@ -221,9 +220,8 @@
.isEqualTo(
String.format(
"Failed to submit 1 change due to the following problems:\n"
- + "Change %d: Change %d is not ready:"
- + " submit requirement 'Code-Owners' is unsatisfied.",
- changeInfo._number, changeInfo._number));
+ + "Change %d: submit requirement 'Code-Owners' is unsatisfied.",
+ changeInfo._number));
}
@Test
@@ -467,15 +465,13 @@
.isEqualTo(
String.format(
"Failed to submit 1 change due to the following problems:\n"
- + "Change %d: Change %d is not ready:"
- + " submit requirement 'Code-Owners' has an error:"
- + " Submittability expression result has an error:"
+ + "Change %s: submit requirement 'Code-Owners' has an"
+ + " error: Submittability expression result has an error:"
+ " Failed to evaluate code owner statuses for"
- + " patch set 1 of change %d (cause: invalid code owner config file '%s'"
+ + " patch set 1 of change %s (cause: invalid code owner config file '%s'"
+ " (project = %s, branch = master):\n %s).%s",
changeInfo._number,
changeInfo._number,
- changeInfo._number,
JgitPath.of(nameOfInvalidCodeOwnerConfigFile).getAsAbsolutePath(),
project,
getParsingErrorMessageForNonParseableCodeOwnerConfig(),
@@ -523,15 +519,13 @@
.isEqualTo(
String.format(
"Failed to submit 1 change due to the following problems:\n"
- + "Change %d: Change %d is not ready:"
- + " submit requirement 'Code-Owners' has an"
+ + "Change %s: submit requirement 'Code-Owners' has an"
+ " error: Submittability expression result has an error:"
+ " Failed to evaluate code owner statuses for"
- + " patch set 1 of change %d (cause: invalid code owner config file '%s'"
+ + " patch set 1 of change %s (cause: invalid code owner config file '%s'"
+ " (project = %s, branch = master):\n %s).",
changeInfo._number,
changeInfo._number,
- changeInfo._number,
JgitPath.of(nameOfInvalidCodeOwnerConfigFile).getAsAbsolutePath(),
project,
getParsingErrorMessageForNonParseableCodeOwnerConfig()));
