diff options
author | Harald Musum <musum@yahoo-inc.com> | 2016-10-03 12:49:43 +0200 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2016-10-03 12:49:43 +0200 |
commit | 42f89030f3fd113cfa27485f81c657a186586b40 (patch) | |
tree | da3b66db4ae2b953df183cddec9ca0497a5c723f | |
parent | 462b9e30840ec255f3dcb6491518fdebd21e0f71 (diff) |
Disable vlidation of deployment.xml
2 files changed, 4 insertions, 1 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java index 26c57483a5c..06ecede09a5 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/ApplicationPackageXmlFilesValidator.java @@ -55,7 +55,8 @@ public class ApplicationPackageXmlFilesValidator { public void checkApplication() throws IOException { validateHostsFile(SchemaValidator.hostsXmlSchemaName); validateServicesFile(SchemaValidator.servicesXmlSchemaName); - validateDeploymentFile(SchemaValidator.deploymentXmlSchemaName); + // TODO: Disable temporarily, need to get out feature to support ignoring validation errors + //validateDeploymentFile(SchemaValidator.deploymentXmlSchemaName); if (appDirs.searchdefinitions().exists()) { if (FilesApplicationPackage.getSearchDefinitionFiles(appDirs.root()).isEmpty()) { diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java index 36e82d39bb3..71c0c639885 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java @@ -21,6 +21,7 @@ import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.search.SearchDefinition; import org.json.JSONException; import org.junit.After; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -210,6 +211,7 @@ public class ApplicationDeployTest { createAppPkg(tmpDir.getAbsolutePath()); } + @Ignore // TODO: Enable when code in ApplicationPackageXmlFilesValidator does validation of deployment.xml @Test(expected = IllegalArgumentException.class) public void testThatAppWithIllegalDeploymentXmlIsNotValid() throws IOException { File tmpDir = Files.createTempDir(); |