Remove obsolete test

2 files changed, 0 insertions, 42 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index 046d4af3899..70a47934262 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -954,25 +954,6 @@ public class DeploymentTriggerTest {
     }
 
     @Test
-    public void ignoresPullRequestInstances() throws Exception {
-        tester.controllerTester().zoneRegistry().setSystemName(SystemName.cd);
-
-        // Current system version, matches version in test data
-        Version version = Version.fromString("6.42.1");
-        tester.upgradeSystem(version);
-        assertEquals(version, tester.controller().versionStatus().systemVersion().get().versionNumber());
-
-        // Load test data data
-        byte[] json = Files.readAllBytes(Paths.get("src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/pr-instance-with-dead-locked-job.json"));
-        Slime slime = SlimeUtils.jsonToSlime(json);
-        tester.controllerTester().createApplication(slime);
-
-        // Failure redeployer does not restart deployment
-        tester.readyJobTrigger().maintain();
-        assertTrue("No jobs scheduled", tester.buildService().jobs().isEmpty());
-    }
-
-    @Test
     public void applicationWithoutProjectIdIsNotTriggered() throws Exception {
         // Current system version, matches version in test data
         Version version = Version.fromString("6.42.1");
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/pr-instance-with-dead-locked-job.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/pr-instance-with-dead-locked-job.json
deleted file mode 100644
index 425b9d4512d..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/testdata/pr-instance-with-dead-locked-job.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "id": "tenant1:app1:default-pr1",
-  "deploymentSpecField": "<deployment version='1.0'>\n  <test />\n  <staging />\n  <prod global-service-id=\"default\">\n    <region active=\"true\">us-central-1</region>\n  </prod>\n</deployment>\n",
-  "validationOverrides": "<deployment version='1.0'/>",
-  "deployments": [],
-  "deploymentJobs": {
-    "projectId": 42,
-    "jobStatus": [
-      {
-        "jobType": "system-test",
-        "lastTriggered": {
-          "version": "6.42.1",
-          "revision": {
-            "applicationPackageHash": "dead"
-          },
-          "upgrade": false,
-          "at": 1499075576005
-        }
-      }
-    ]
-  },
-  "outstandingChangeField": false
-}