You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/02/23 01:32:13 UTC
svn commit: r1449258 -
/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
Author: markrmiller
Date: Sat Feb 23 00:32:12 2013
New Revision: 1449258
URL: http://svn.apache.org/r1449258
Log:
SOLR-4471: Fix up test.
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1449258&r1=1449257&r2=1449258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Sat Feb 23 00:32:12 2013
@@ -447,7 +447,12 @@ public class TestReplicationHandler exte
assertTrue(slaveXsltDir.isDirectory());
assertTrue(slaveXsl.exists());
-
+
+ // revert the schema
+ master.copyConfigFile(CONF_DIR + "schema-replication1.xml", "schema.xml");
+ masterJetty.stop();
+ masterJetty = createJetty(master);
+ masterClient = createNewSolrServer(masterJetty.getLocalPort());
}
@Test
@@ -674,8 +679,8 @@ public class TestReplicationHandler exte
}
}
-
- private void doTestReplicateAfterStartup() throws Exception {
+ @Test
+ public void doTestReplicateAfterStartup() throws Exception {
//stop slave
slaveJetty.stop();
@@ -737,7 +742,8 @@ public class TestReplicationHandler exte
slaveClient = createNewSolrServer(slaveJetty.getLocalPort());
}
- private void doTestReplicateAfterStartupWithNoActivity() throws Exception {
+ @Test
+ public void doTestReplicateAfterStartupWithNoActivity() throws Exception {
useFactory(null);
try {
@@ -961,6 +967,18 @@ public class TestReplicationHandler exte
slaveQueryRsp = rQuery(1, "*:*", slaveClient);
SolrDocument d = ((SolrDocumentList) slaveQueryRsp.get("response")).get(0);
assertEquals("newname = 2001", (String) d.getFieldValue("newname"));
+
+ // revert configs
+ //change solrconfig on master
+ master.copyConfigFile(CONF_DIR + "solrconfig-master1.xml",
+ "solrconfig.xml");
+ //change schema on master
+ master.copyConfigFile(CONF_DIR + "schema-replication1.xml",
+ "schema.xml");
+ masterJetty.stop();
+
+ masterJetty = createJetty(master);
+ masterClient = createNewSolrServer(masterJetty.getLocalPort());
}