summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2016-09-28 15:00:27 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2016-09-28 15:00:27 +0200
commitf9dd06806afef90b069f4fa0c99f77beb040851d (patch)
treeecce12a3af04d80e5d39b0ebce919aa5c0fef81b /application
parent321194bbe4a36d100d92188644d90c6cf4d373c7 (diff)
Support document-api in application
Diffstat (limited to 'application')
-rw-r--r--application/src/main/java/com/yahoo/application/Application.java1
-rw-r--r--application/src/test/java/com/yahoo/application/ApplicationTest.java3
2 files changed, 2 insertions, 2 deletions
diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java
index cc1b785ae0b..22c3a94bedc 100644
--- a/application/src/main/java/com/yahoo/application/Application.java
+++ b/application/src/main/java/com/yahoo/application/Application.java
@@ -51,6 +51,7 @@ public final class Application implements AutoCloseable {
// For internal use only
Application(Path path, Networking networking, boolean deletePathWhenClosing) {
+ System.setProperty("vespa.local", "true");
this.path = path;
this.deletePathWhenClosing = deletePathWhenClosing;
contentClusters = ContentCluster.fromPath(path);
diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java
index 1d9dd2ec4d9..1b9815dc536 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationTest.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationTest.java
@@ -366,13 +366,12 @@ public class ApplicationTest {
}
@Test
- @Ignore // TODO: New test
public void application_with_document_api() {
String services =
"<container version='1.0'>" +
" <document-api/>" +
"</container>";
- try (Application application = Application.fromServicesXml(services, Networking.disable)) {
+ try (Application application = Application.fromServicesXml(services, Networking.enable)) {
}
}