From f462fe2794ddaa10ce68ebf1ccbd23f990e154cf Mon Sep 17 00:00:00 2001 From: Ishan Chattopadhyaya Date: Fri, 15 Nov 2019 01:05:25 +0200 Subject: [PATCH] SOLR-13662: Renaming the test jars to .tmp to avoid precommit failures. Adding timeout for test failure fix. --- ... => question-answer-request-handler-1.0.jar.tmp} | Bin ... => question-answer-request-handler-1.1.jar.tmp} | Bin .../solr/question-answer-repository/repository.json | 4 ++-- .../apache/solr/cloud/PackageManagerCLITest.java | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename solr/core/src/test-files/solr/question-answer-repository/{question-answer-request-handler-1.0.jar => question-answer-request-handler-1.0.jar.tmp} (100%) rename solr/core/src/test-files/solr/question-answer-repository/{question-answer-request-handler-1.1.jar => question-answer-request-handler-1.1.jar.tmp} (100%) diff --git a/solr/core/src/test-files/solr/question-answer-repository/question-answer-request-handler-1.0.jar b/solr/core/src/test-files/solr/question-answer-repository/question-answer-request-handler-1.0.jar.tmp similarity index 100% rename from solr/core/src/test-files/solr/question-answer-repository/question-answer-request-handler-1.0.jar rename to solr/core/src/test-files/solr/question-answer-repository/question-answer-request-handler-1.0.jar.tmp diff --git a/solr/core/src/test-files/solr/question-answer-repository/question-answer-request-handler-1.1.jar b/solr/core/src/test-files/solr/question-answer-repository/question-answer-request-handler-1.1.jar.tmp similarity index 100% rename from solr/core/src/test-files/solr/question-answer-repository/question-answer-request-handler-1.1.jar rename to solr/core/src/test-files/solr/question-answer-repository/question-answer-request-handler-1.1.jar.tmp diff --git a/solr/core/src/test-files/solr/question-answer-repository/repository.json b/solr/core/src/test-files/solr/question-answer-repository/repository.json index 51609723bb2..17c4e7e5be7 100644 --- a/solr/core/src/test-files/solr/question-answer-repository/repository.json +++ b/solr/core/src/test-files/solr/question-answer-repository/repository.json @@ -8,7 +8,7 @@ "date": "2019-01-01", "artifacts": [ { - "url": "question-answer-request-handler-1.0.jar", + "url": "question-answer-request-handler-1.0.jar.tmp", "sig": "TTzgh5/usbyWg7oZ7lRwz4eQfh1FeXWvv4U85tsVthVz0MRDz9t7SmonDkegZ7OyqeoiQ4I207pifpVW+DRd9Q==" } ], @@ -45,7 +45,7 @@ "date": "2019-01-01", "artifacts": [ { - "url": "question-answer-request-handler-1.1.jar", + "url": "question-answer-request-handler-1.1.jar.tmp", "sig": "LypqlmbJ76AWa5jx0XhjKxO4lrcQAvpSuYddfzcE6TnX0VDPFhrlQHSSX6cZLtvNbQ+74xUMKgsoX1IUnEnKYw==" } ] diff --git a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java index a9bf9075826..4c08aad2eca 100644 --- a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java +++ b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java @@ -144,7 +144,7 @@ public class PackageManagerCLITest extends SolrCloudTestCase { cluster.getSolrClient(), Arrays.asList("response", "params", "PKG_VERSIONS", pkg), version, - 1); + 10); TestSolrConfigHandler.testForResponseElement( null, @@ -153,7 +153,7 @@ public class PackageManagerCLITest extends SolrCloudTestCase { cluster.getSolrClient(), Arrays.asList("config", "requestHandler", component, "_packageinfo_", "version"), componentVersion, - 1); + 10); } private void run(PackageTool tool, String[] args) throws Exception {