You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2019/10/18 10:22:44 UTC

[lucene-solr] branch jira/solr-13662 updated: Adding update test

This is an automated email from the ASF dual-hosted git repository.

ishan pushed a commit to branch jira/solr-13662
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr-13662 by this push:
     new b5959e6  Adding update test
b5959e6 is described below

commit b5959e64db0abef6170aaf75a652ef985d140cab
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Fri Oct 18 15:52:26 2019 +0530

    Adding update test
---
 solr/core/src/java/org/apache/solr/util/PackageTool.java            | 4 +++-
 solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/util/PackageTool.java b/solr/core/src/java/org/apache/solr/util/PackageTool.java
index fa8220b..6528e4c 100644
--- a/solr/core/src/java/org/apache/solr/util/PackageTool.java
+++ b/solr/core/src/java/org/apache/solr/util/PackageTool.java
@@ -211,8 +211,10 @@ public class PackageTool extends SolrCLI.ToolBase {
       updateManager.updatePackage(packageName, latestVersion);
 
       SolrPackageInstance updatedPackage = packageManager.getPackage(packageName);
+      boolean res = packageManager.verify(updatedPackage, collectionsDeployedIn);
       System.out.println("Verifying version "+updatedPackage.getVersion()+" on "+collectionsDeployedIn
-          +", result: "+packageManager.verify(updatedPackage, collectionsDeployedIn));
+          +", result: "+res);
+      if (!res) throw new PackageManagerException("Failed verification after deployment");
     } else {
       System.out.println("Package "+packageName+" is already up to date.");
     }
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 e4dd46d..bcfb0db 100644
--- a/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java
@@ -66,6 +66,10 @@ public class PackageManagerCLITest extends SolrCloudTestCase {
 
     res = run(tool, new String[] {"-solrUrl", solrUrl, "deploy", "question-answer", "-collections", "abc", "-p", "RH-HANDLER-PATH=/mypath2"});
     assertEquals("tool should have returned 0 for success ", 0, res);
+    
+    res = run(tool, new String[] {"-solrUrl", solrUrl, "update", "question-answer"});
+    assertEquals("tool should have returned 0 for success ", 0, res);
+
   }
 
   private int run(PackageTool tool, String[] args) throws Exception {