diff options
Diffstat (limited to 'configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java')
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java index 4aad449537a..42c22977f79 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.server.maintenance; import com.yahoo.config.provision.ApplicationId; @@ -9,7 +9,6 @@ import com.yahoo.test.ManualClock; import com.yahoo.vespa.config.server.ApplicationRepository; import com.yahoo.vespa.config.server.session.PrepareParams; import com.yahoo.vespa.config.server.tenant.TenantRepository; -import com.yahoo.vespa.flags.InMemoryFlagSource; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -46,7 +45,7 @@ public class TenantsMaintainerTest { assertNotNull(tenantRepository.getTenant(shouldNotBeDeleted)); clock.advance(TenantsMaintainer.defaultTtlForUnusedTenant.plus(Duration.ofDays(1))); - new TenantsMaintainer(applicationRepository, tester.curator(), new InMemoryFlagSource(), Duration.ofDays(1), clock).run(); + new TenantsMaintainer(applicationRepository, tester.curator(), Duration.ofDays(1), clock).run(); // One tenant should now have been deleted assertNull(tenantRepository.getTenant(shouldBeDeleted)); @@ -63,7 +62,19 @@ public class TenantsMaintainerTest { } private PrepareParams.Builder prepareParams(TenantName tenantName) { - return new PrepareParams.Builder().applicationId(applicationId(tenantName)); + String endpoints = """ + [ + { + "clusterId": "container", + "names": [ + "c.example.com" + ], + "scope": "zone", + "routingMethod": "exclusive" + } + ] + """; + return new PrepareParams.Builder().containerEndpoints(endpoints).applicationId(applicationId(tenantName)); } private ApplicationId applicationId(TenantName tenantName) { |