diff options
author | bjormel <bjormel@verizonmedia.com> | 2022-12-19 14:48:10 +0100 |
---|---|---|
committer | bjormel <bjormel@verizonmedia.com> | 2022-12-19 14:48:10 +0100 |
commit | eba6fd819c319d858c8996bf06d93c0b19473fad (patch) | |
tree | 71c449398ff52a3bd7c100d791fc1471a69355ba /node-admin/src/test | |
parent | d6c2daab3ea893e264de7a08c4e76f99fac2a43e (diff) |
do not disable other repos by default
Diffstat (limited to 'node-admin/src/test')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/yum/YumTest.java | 23 |
1 files changed, 19 insertions, 4 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 e52dedbf7ef..ba3e9238d83 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 @@ -99,7 +99,7 @@ public class YumTest { void testAlreadyInstalled() { mockRpmQuery("package-1", null); terminal.expectCommand( - "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo1 --enablerepo=repo2 --setopt skip_missing_names_on_install=False package-1 package-2 2>&1", + "yum install --assumeyes --enablerepo=repo1 --enablerepo=repo2 --setopt skip_missing_names_on_install=False package-1 package-2 2>&1", 0, "foobar\nNothing to do.\n"); // Note trailing dot assertFalse(yum.install("package-1", "package-2") @@ -161,6 +161,20 @@ public class YumTest { void testInstallWithEnablerepo() { mockRpmQuery("package-1", null); terminal.expectCommand( + "yum install --assumeyes --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1", + 0, + "installing, installing"); + + assertTrue(yum + .install("package-1", "package-2") + .enableRepo("repo-name") + .converge(taskContext)); + } + + @Test + void testInstallWithEnablerepoDisablerepo() { + mockRpmQuery("package-1", null); + terminal.expectCommand( "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1", 0, "installing, installing"); @@ -168,6 +182,7 @@ public class YumTest { assertTrue(yum .install("package-1", "package-2") .enableRepo("repo-name") + .disableRepo("*") .converge(taskContext)); } @@ -201,10 +216,10 @@ public class YumTest { terminal.expectCommand("yum versionlock delete \"package-0:0.1-8.el7.*\" 2>&1"); - terminal.expectCommand("yum versionlock add --assumeyes \"--disablerepo=*\" --enablerepo=somerepo \"package-0:0.10-654.el7.*\" 2>&1"); + terminal.expectCommand("yum versionlock add --assumeyes --enablerepo=somerepo \"package-0:0.10-654.el7.*\" 2>&1"); terminal.expectCommand( - "yum install --assumeyes \"--disablerepo=*\" --enablerepo=somerepo package-0:0.10-654.el7 2>&1", + "yum install --assumeyes --enablerepo=somerepo package-0:0.10-654.el7 2>&1", 0, "Nothing to do\n"); @@ -254,7 +269,7 @@ public class YumTest { assertThrows(ChildProcessFailureException.class, () -> { mockRpmQuery("package-1", null); terminal.expectCommand( - "yum install --assumeyes \"--disablerepo=*\" --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1", + "yum install --assumeyes --enablerepo=repo-name --setopt skip_missing_names_on_install=False package-1 package-2 2>&1", 1, "error"); |