diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-15 16:56:54 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-15 16:56:54 +0100 |
commit | 164e8f87b2514d9405bddad0d5b9408d284ccf08 (patch) | |
tree | f11b21c93a61eeaf63ae4958e25f93e31be61d97 /config-model | |
parent | 5ee662b82653ab871608fae7b80d10e0cf63b076 (diff) |
Simplify test for docproc cluster.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java index 354f2d9cf8d..a2f68ec8f18 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java @@ -1440,48 +1440,34 @@ public class ContentClusterTest extends ContentBaseTest { assertGroupsAllowedDown(2, 1, 2); } - private void assertIndexingDocprocEnabled(boolean indexed, boolean force) { + private void assertIndexingDocprocEnabled(boolean indexed) { String services = "<?xml version='1.0' encoding='UTF-8' ?>" + "<services version='1.0'>" + " <container id='default' version='1.0'>" + - " <document-processing/>" + + " <search/>" + " </container>" + " <content id='search' version='1.0'>" + " <redundancy>1</redundancy>" + " <documents>" + - " <document-processing cluster='default'" + (force ? " chain='indexing'" : "") + "/>" + " <document type='type1' mode='" + (indexed ? "index" : "streaming") + "'/>" + " </documents>" + " </content>" + "</services>"; VespaModel model = createEnd2EndOneNode(new TestProperties(), services); var searchCluster = model.getContentClusters().get("search").getSearch(); - if (force) { - assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search")); - assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search")); - } else if (indexed) { - assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search")); - } else { - assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search")); - } + assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search")); } @Test void testIndexingDocprocEnabledWhenIndexMode() { - assertIndexingDocprocEnabled(true, false); + assertIndexingDocprocEnabled(true); } @Test void testIndexingDocprocNotEnabledWhenStreamingMode() { - assertIndexingDocprocEnabled(false, false); - } - - @Test - void testIndexingDocprocEnabledWhenStreamingModeAndForced() - { - assertIndexingDocprocEnabled(false, true); + assertIndexingDocprocEnabled(false); } private void assertGroupsAllowedDown(int groupCount, double groupsAllowedDown, int expectedGroupsAllowedDown) { |