Remove unnecessary test and fix syntax in services.xml

2 files changed, 1 insertions, 13 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
index 126dfe88141..809bcdc1a6e 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationContentHandlerTest.java
@@ -36,14 +36,12 @@ import static org.junit.Assert.assertThat;
 public class ApplicationContentHandlerTest extends ContentHandlerTestBase {
 
     private static final File testApp = new File("src/test/apps/content");
-    private static final File testApp2 = new File("src/test/apps/content2");
 
     private final TenantName tenantName1 = TenantName.from("mofet");
     private final TenantName tenantName2 = TenantName.from("bla");
     private final String baseServer = "http://foo:1337";
 
     private final ApplicationId appId1 = new ApplicationId.Builder().tenant(tenantName1).applicationName("foo").instanceName("quux").build();
-    private final ApplicationId appId2 = new ApplicationId.Builder().tenant(tenantName2).applicationName("foo").instanceName("quux").build();
 
     private ApplicationRepository applicationRepository;
     private ApplicationHandler handler;
@@ -77,8 +75,6 @@ public class ApplicationContentHandlerTest extends ContentHandlerTestBase {
                 .build();
 
         applicationRepository.deploy(testApp, prepareParams(appId1));
-        applicationRepository.deploy(testApp2, prepareParams(appId2));
-
         handler = new ApplicationHandler(ApplicationHandler.testOnlyContext(),
                                          Zone.defaultZone(),
                                          applicationRepository);
@@ -113,14 +109,6 @@ public class ApplicationContentHandlerTest extends ContentHandlerTestBase {
     }
 
     @Test
-    public void require_that_multiple_tenants_are_handled() throws IOException {
-        assertContent("/test.txt", "foo\n");
-        pathPrefix = createPath(appId2, Zone.defaultZone());
-        baseUrl = baseServer + pathPrefix;
-        assertContent("/test.txt", "bar\n");
-    }
-
-    @Test
     public void require_that_get_does_not_set_write_flag() throws IOException {
         Tenant tenant1 = applicationRepository.getTenant(appId1);
         Session session = applicationRepository.getActiveLocalSession(tenant1, appId1);
diff --git a/configserver/src/test/resources/deploy/advancedapp/services.xml b/configserver/src/test/resources/deploy/advancedapp/services.xml
index e3d5aea585b..b8e93b14317 100644
--- a/configserver/src/test/resources/deploy/advancedapp/services.xml
+++ b/configserver/src/test/resources/deploy/advancedapp/services.xml
@@ -22,7 +22,7 @@
         <documents>
             <document type="keyvalue" mode="index"/>
         </documents>
-        <nodes>>
+        <nodes>
             <node hostalias="node1" distribution-key="0"/>
         </nodes>
     </content>