Skip to content

Commit

Permalink
tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
epugh committed Jun 9, 2024
1 parent eef5b00 commit a6fae01
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 6 deletions.
31 changes: 31 additions & 0 deletions gradle/documentation/changes-to-html/changes2html.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
def setup_month_nums():
"""
Returns a list of alternating English month representations and the two-digit
month number corresponding to them, for use in populating the month_nums
dictionary.
"""
return [
('Jan', '01'), ('Jan.', '01'), ('January', '01'),
('Feb', '02'), ('Feb.', '02'), ('February', '02'),
('Mar', '03'), ('Mar.', '03'), ('March', '03'),
('Apr', '04'), ('Apr.', '04'), ('April', '04'),
('May', '05'),
('Jun', '06'), ('Jun.', '06'), ('June', '06'),
('Jul', '07'), ('Jul.', '07'), ('July', '07'),
('Aug', '08'), ('Aug.', '08'), ('August', '08'),
('Sep', '09'), ('Sep.', '09'),
('Sept', '09'), ('Sept.', '09'), ('September', '09'),
('Oct', '10'), ('Oct.', '10'), ('October', '10'),
('Nov', '11'), ('Nov.', '11'), ('November', '11'),
('Dec', '12'), ('Dec.', '12'), ('December', '12')
]

def setup_lucene_bugzilla_jira_map():
"""
Returns a list of alternating Bugzilla bug IDs and LUCENE-* JIRA issue
numbers, for use in populating the %lucene_bugzilla_jira_map hash
"""
return {
4049: 1, 4102: 2, 4105: 3, 4254: 4, 4555: 5, 4568: 6, 4754: 7, 5313: 8,
36296: 428, 36333: 429, 36622: 430, 36623: 431, 36628: 432
}
31 changes: 25 additions & 6 deletions solr/core/src/test/org/apache/solr/cli/PackageToolTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ public void testPackageTool() throws Exception {
new String[] {
"--solr-url",
solrUrl,

"add-repo",
"fullstory",
"http://localhost:" + repositoryServer.getPort(),
Expand All @@ -119,7 +118,9 @@ public void testPackageTool() throws Exception {

run(
tool,
new String[] {"--solr-url", solrUrl, "list-available", "--credentials", SecurityJson.USER_PASS});
new String[] {
"--solr-url", solrUrl, "list-available", "--credentials", SecurityJson.USER_PASS
});

run(
tool,
Expand All @@ -134,7 +135,9 @@ public void testPackageTool() throws Exception {

run(
tool,
new String[] {"--solr-url", solrUrl, "list-installed", "--credentials", SecurityJson.USER_PASS});
new String[] {
"--solr-url", solrUrl, "list-installed", "--credentials", SecurityJson.USER_PASS
});

withBasicAuth(CollectionAdminRequest.createCollection("abc", "conf1", 1, 1))
.processAndWait(cluster.getSolrClient(), 10);
Expand Down Expand Up @@ -186,7 +189,13 @@ public void testPackageTool() throws Exception {
run(
tool,
new String[] {
"--solr-url", solrUrl, "list-deployed", "-c", "abc", "--credentials", SecurityJson.USER_PASS
"--solr-url",
solrUrl,
"list-deployed",
"-c",
"abc",
"--credentials",
SecurityJson.USER_PASS
});

// Should we test the "auto-update to latest" functionality or the default explicit deploy
Expand Down Expand Up @@ -216,7 +225,12 @@ public void testPackageTool() throws Exception {
run(
tool,
new String[] {
"--solr-url", solrUrl, "install", "question-answer", "--credentials", SecurityJson.USER_PASS
"--solr-url",
solrUrl,
"install",
"question-answer",
"--credentials",
SecurityJson.USER_PASS
});
assertPackageVersion(
"abc", "question-answer", "$LATEST", rhPath, "1.1.0", SecurityJson.USER_PASS);
Expand All @@ -226,7 +240,12 @@ public void testPackageTool() throws Exception {
run(
tool,
new String[] {
"--solr-url", solrUrl, "install", "question-answer", "--credentials", SecurityJson.USER_PASS
"--solr-url",
solrUrl,
"install",
"question-answer",
"--credentials",
SecurityJson.USER_PASS
});
assertPackageVersion(
"abc", "question-answer", "1.0.0", rhPath, "1.0.0", SecurityJson.USER_PASS);
Expand Down

0 comments on commit a6fae01

Please sign in to comment.