From 727b2716df0730f4934257bbecbd9c28046d100f Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Wed, 6 Nov 2019 09:59:54 +0100 Subject: Let DeploymentSteps insert test jobs (do not trust DeploymentSpec) --- .../api/DeploymentSpecDeprecatedAPITest.java | 333 --------------------- 1 file changed, 333 deletions(-) delete mode 100644 config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java (limited to 'config-model-api/src') diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java deleted file mode 100644 index 132e716335d..00000000000 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java +++ /dev/null @@ -1,333 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.config.application.api; - -import com.google.common.collect.ImmutableSet; -import com.yahoo.config.provision.Environment; -import com.yahoo.config.provision.RegionName; -import org.junit.Test; - -import java.io.StringReader; -import java.time.Instant; -import java.time.ZoneId; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - -import static com.yahoo.config.application.api.Notifications.Role.author; -import static com.yahoo.config.application.api.Notifications.When.failing; -import static com.yahoo.config.application.api.Notifications.When.failingCommit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -/** - * @author bratseth - */ -// TODO: Remove after November 2019 -public class DeploymentSpecDeprecatedAPITest { - - @Test - public void testSpec() { - String specXml = "" + - " " + - ""; - - StringReader r = new StringReader(specXml); - DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals(specXml, spec.xmlForm()); - assertEquals(1, spec.steps().size()); - assertFalse(spec.majorVersion().isPresent()); - assertTrue(spec.steps().get(0).deploysTo(Environment.test)); - } - - @Test - public void testSpecPinningMajorVersion() { - String specXml = "" + - " " + - ""; - - StringReader r = new StringReader(specXml); - DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals(specXml, spec.xmlForm()); - assertEquals(1, spec.steps().size()); - assertTrue(spec.majorVersion().isPresent()); - assertEquals(6, (int)spec.majorVersion().get()); - } - - @Test - public void stagingSpec() { - StringReader r = new StringReader( - "" + - " " + - "" - ); - - DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals(2, spec.steps().size()); - assertTrue(spec.steps().get(0).deploysTo(Environment.test)); - assertTrue(spec.steps().get(1).deploysTo(Environment.staging)); - } - - @Test - public void minimalProductionSpec() { - StringReader r = new StringReader( - "" + - " " + - " us-east1" + - " us-west1" + - " " + - "" - ); - - DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals(4, spec.steps().size()); - - assertTrue(spec.steps().get(0).deploysTo(Environment.test)); - - assertTrue(spec.steps().get(1).deploysTo(Environment.staging)); - - assertTrue(spec.steps().get(2).deploysTo(Environment.prod, Optional.of(RegionName.from("us-east1")))); - assertFalse(((DeploymentSpec.DeclaredZone)spec.steps().get(2)).active()); - - assertTrue(spec.steps().get(3).deploysTo(Environment.prod, Optional.of(RegionName.from("us-west1")))); - assertTrue(((DeploymentSpec.DeclaredZone)spec.steps().get(3)).active()); - - } - - @Test - public void deploymentSpecWithTest() { - StringReader r = new StringReader( - "" + - " " + - " " + - " " + - " us-east1" + - " us-west1" + - " " + - "" - ); - - DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals("[test, staging, prod.us-east1, prod.us-west1]", spec.steps().toString()); - } - - @Test - public void deploymentSpecWithTestInsideInstance() { - StringReader r = new StringReader( - "" + - " " + - " " + - " " + - " " + - " us-east1" + - " us-west1" + - " " + - " " + - "" - ); - - DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals("[test, staging, prod.us-east1, prod.us-west1]", spec.steps().toString()); - } - - @Test - public void deploymentSpecWithTestOutsideInstance() { - StringReader r = new StringReader( - "" + - " " + - " " + - " " + - " " + - " us-east1" + - " us-west1" + - " " + - " " + - "" - ); - - DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals("[test, staging, prod.us-east1, prod.us-west1]", spec.steps().toString()); - } - - @Test - public void maximalProductionSpec() { - StringReader r = new StringReader( - "" + - " " + - " " + - " " + - " us-east1" + - " " + - " us-west1" + - " " + - "" - ); - - DeploymentSpec spec = DeploymentSpec.fromXml(r); - assertEquals(5, spec.steps().size()); - - assertTrue(spec.steps().get(0).deploysTo(Environment.test)); - - assertTrue(spec.steps().get(1).deploysTo(Environment.staging)); - - assertTrue(spec.steps().get(2).deploysTo(Environment.prod, Optional.of(RegionName.from("us-east1")))); - assertFalse(((DeploymentSpec.DeclaredZone)spec.steps().get(2)).active()); - - assertTrue(spec.steps().get(3) instanceof DeploymentSpec.Delay); - - assertTrue(spec.steps().get(4).deploysTo(Environment.prod, Optional.of(RegionName.from("us-west1")))); - assertTrue(((DeploymentSpec.DeclaredZone)spec.steps().get(4)).active()); - - } - - @Test - public void productionSpecWithGlobalServiceId() { - StringReader r = new StringReader( - "" + - " " + - " us-east-1" + - " us-west-1" + - " " + - "" - ); - - DeploymentSpec spec = DeploymentSpec.fromXml(r); - } - - @Test(expected=IllegalArgumentException.class) - public void globalServiceIdInTest() { - StringReader r = new StringReader( - "" + - " " + - "" - ); - DeploymentSpec spec = DeploymentSpec.fromXml(r); - } - - @Test(expected=IllegalArgumentException.class) - public void globalServiceIdInStaging() { - StringReader r = new StringReader( - "" + - " " + - "" - ); - DeploymentSpec spec = DeploymentSpec.fromXml(r); - } - - @Test - public void maxDelayExceeded() { - try { - StringReader r = new StringReader( - "" + - " " + - " " + - " us-west-1" + - " " + - " us-central-1" + - " " + - " us-east-3" + - " " + - "" - ); - DeploymentSpec.fromXml(r); - fail("Expected exception due to exceeding the max total delay"); - } - catch (IllegalArgumentException e) { - // success - assertEquals("The total delay specified is PT24H1S but max 24 hours is allowed", e.getMessage()); - } - } - - @Test - public void testEmpty() { - assertTrue(DeploymentSpec.empty.steps().isEmpty()); - assertEquals("", DeploymentSpec.empty.xmlForm()); - } - - @Test - public void productionSpecWithParallelDeployments() { - StringReader r = new StringReader( - "\n" + - " \n" + - " us-west-1\n" + - " \n" + - " us-central-1\n" + - " us-east-3\n" + - " \n" + - " \n" + - "" - ); - DeploymentSpec spec = DeploymentSpec.fromXml(r); - DeploymentSpec.ParallelZones parallelZones = ((DeploymentSpec.ParallelZones) spec.steps().get(3)); - assertEquals(2, parallelZones.zones().size()); - assertEquals(RegionName.from("us-central-1"), parallelZones.zones().get(0).region().get()); - assertEquals(RegionName.from("us-east-3"), parallelZones.zones().get(1).region().get()); - } - - @Test - public void productionSpecWithDuplicateRegions() { - StringReader r = new StringReader( - "\n" + - " \n" + - " us-west-1\n" + - " \n" + - " us-west-1\n" + - " us-central-1\n" + - " us-east-3\n" + - " \n" + - " \n" + - "" - ); - try { - DeploymentSpec.fromXml(r); - fail("Expected exception"); - } catch (IllegalArgumentException e) { - assertEquals("prod.us-west-1 is listed twice in deployment.xml", e.getMessage()); - } - } - - @Test(expected = IllegalArgumentException.class) - public void deploymentSpecWithIllegallyOrderedDeploymentSpec1() { - StringReader r = new StringReader( - "\n" + - " \n" + - " \n" + - " us-west-1\n" + - " \n" + - " \n" + - "" - ); - DeploymentSpec.fromXml(r); - } - - @Test(expected = IllegalArgumentException.class) - public void deploymentSpecWithIllegallyOrderedDeploymentSpec2() { - StringReader r = new StringReader( - "\n" + - " \n" + - " \n" + - " \n" + - " us-west-1\n" + - " \n" + - "" - ); - DeploymentSpec.fromXml(r); - } - - @Test - public void customTesterFlavor() { - DeploymentSpec spec = DeploymentSpec.fromXml("\n" + - " \n" + - " \n" + - " us-north-7\n" + - " \n" + - ""); - assertEquals(Optional.of("d-1-4-20"), spec.steps().get(0).zones().get(0).testerFlavor()); - assertEquals(Optional.empty(), spec.steps().get(1).zones().get(0).testerFlavor()); - assertEquals(Optional.of("d-2-8-50"), spec.steps().get(2).zones().get(0).testerFlavor()); - } - -} -- cgit v1.2.3