diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-07-06 14:51:32 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-07-06 14:51:32 +0200 |
commit | de44c5dbaa2f8a3c5ddbef4d71f40ed696d3a119 (patch) | |
tree | b1f0d4da0e6fd482798947ba449ce5363bf32dc7 /node-admin | |
parent | d3762db8b33262efc8c5929ff91c231a007a6dd5 (diff) |
Test epoch:name-ver-rel.arch input
Diffstat (limited to 'node-admin')
2 files changed, 4 insertions, 4 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java index 57e52a9581f..40a2c49b85a 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageName.java @@ -124,7 +124,7 @@ public class YumPackageName { * @throws IllegalArgumentException if spec does not specify a package name. * @see #parseString(String) */ - public static YumPackageName fromString(final String packageSpec) { + public static YumPackageName fromString(String packageSpec) { String spec = packageSpec; Optional<String> epoch = Optional.empty(); String name = null; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java index 02064277f6c..bcec086b4af 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumPackageNameTest.java @@ -96,7 +96,7 @@ public class YumPackageNameTest { // epoch:name-ver-rel.arch verifyPackageName( - "docker-2:1.12.6-71.git3e8e77d.el7.centos.1.x86_64", + "2:docker-1.12.6-71.git3e8e77d.el7.centos.1.x86_64", "2", "docker", "1.12.6", @@ -106,7 +106,7 @@ public class YumPackageNameTest { "docker-2:1.12.6-71.git3e8e77d.el7.centos.1.*"); } - private void verifyPackageName(String packageName, + private void verifyPackageName(String input, String epoch, String name, String version, @@ -114,7 +114,7 @@ public class YumPackageNameTest { String architecture, String toName, String toVersionName) { - YumPackageName yumPackageName = YumPackageName.fromString(packageName); + YumPackageName yumPackageName = YumPackageName.fromString(input); verifyValue(epoch, yumPackageName.getEpoch()); verifyValue(name, Optional.of(yumPackageName.getName())); verifyValue(version, yumPackageName.getVersion()); |