Add command for deleting version lock

2 files changed, 28 insertions, 1 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
index feafb2a9a31..3376ba70500 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java
@@ -301,6 +301,19 @@ public class YumTest {
         yum.upgrade().converge(taskContext);
     }
 
+    @Test
+    public void testDeleteVersionLock() {
+        terminal.expectCommand("yum versionlock delete openssh-0:8.0p1-4.el8_1.x86_64 2>&1");
+
+        YumPackageName pkg = new YumPackageName
+                .Builder("openssh")
+                .setVersion("8.0p1")
+                .setRelease("4.el8_1")
+                .setArchitecture("x86_64")
+                .build();
+        assertTrue(yum.deleteVersionLock(pkg).converge(taskContext));
+    }
+
     private void mockRpmQuery(String packageName, YumPackageName installedOrNull) {
         new YumTester(terminal).expectQueryInstalled(packageName).andReturn(installedOrNull);
     }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java
index 6d1049cfa6c..f5cb188d07a 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTesterTest.java
@@ -38,6 +38,11 @@ public class YumTesterTest {
 
         assertYumMethod(yum -> yum.expectInstallFixedVersion(minimalPackage.toName()).withEnableRepo(repos),
                 yum -> yum.installFixedVersion(minimalPackage).enableRepo(repos).converge(context));
+
+        // versionlock always returns success
+        assertYumMethodAlwaysSuccess(yum -> yum.expectDeleteVersionLock(minimalPackage.toName()),
+                                     yum -> yum.deleteVersionLock(minimalPackage).converge(context));
+
     }
 
     @Test
@@ -48,7 +53,7 @@ public class YumTesterTest {
     }
 
     private void assertYumMethod(Function<YumTester, YumTester.GenericYumCommandExpectation> yumTesterExpectationFunction,
-                                       Function<Yum, Boolean> yumFunction) {
+                                 Function<Yum, Boolean> yumFunction) {
         List.of(true, false).forEach(wantedReturnValue -> {
             yumTesterExpectationFunction.apply(yum).andReturn(wantedReturnValue);
             assertEquals(wantedReturnValue, yumFunction.apply(yum));
@@ -56,4 +61,13 @@ public class YumTesterTest {
         });
     }
 
+    private void assertYumMethodAlwaysSuccess(Function<YumTester, YumTester.GenericYumCommandExpectation> yumTesterExpectationFunction,
+                                              Function<Yum, Boolean> yumFunction) {
+        List.of(true, false).forEach(wantedReturnValue -> {
+            yumTesterExpectationFunction.apply(yum).andReturn(wantedReturnValue);
+            assertEquals(true, yumFunction.apply(yum));
+            terminal.verifyAllCommandsExecuted();
+        });
+    }
+
 }